Merge branch 'master' into routing

961 files changed, 57878 insertions, 9859 deletions

diff --git a/apps/admin_dependencies_chk/l10n/.gitkeep b/apps/admin_dependencies_chk/l10n/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/.gitkeep
diff --git a/apps/admin_dependencies_chk/l10n/ca.php b/apps/admin_dependencies_chk/l10n/ca.php
new file mode 100644
index 00000000000..08f4ec80781
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/ca.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "El mòdul php-json és necessari per moltes aplicacions per comunicacions internes",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "El mòdul php-curl és necessari per mostrar el títol de la pàgina quan s'afegeixen adreces d'interès",
+"The php-gd module is needed to create thumbnails of your images" => "El mòdul php-gd és necessari per generar miniatures d'imatges",
+"The php-ldap module is needed connect to your ldap server" => "El mòdul php-ldap és necessari per connectar amb el servidor ldap",
+"The php-zip module is needed download multiple files at once" => "El mòdul php-zip és necessari per baixar múltiples fitxers de cop",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "El mòdul php-mb_multibyte és necessari per gestionar correctament la codificació.",
+"The php-ctype module is needed validate data." => "El mòdul php-ctype és necessari per validar dades.",
+"The php-xml module is needed to share files with webdav." => "El mòdul php-xml és necessari per compatir els fitxers amb webdav.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "La directiva allow_url_fopen de php.ini hauria d'establir-se en 1 per accedir a la base de coneixements dels servidors OCS",
+"The php-pdo module is needed to store owncloud data into a database." => "El mòdul php-pdo és necessari per desar les dades d'ownCloud en una base de dades.",
+"Dependencies status" => "Estat de dependències",
+"Used by :" => "Usat per:"
+);
diff --git a/apps/admin_dependencies_chk/l10n/de.php b/apps/admin_dependencies_chk/l10n/de.php
new file mode 100644
index 00000000000..01609168098
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/de.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "Das Modul  php-json wird von vielen Anwendungen zur internen Kommunikation benötigt.",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Das Modul php-curl wird benötigt, um den Titel der Seite für die Lesezeichen hinzuzufügen.",
+"The php-gd module is needed to create thumbnails of your images" => "Das Modul  php-gd wird für die Erzeugung der Vorschaubilder benötigt.",
+"The php-ldap module is needed connect to your ldap server" => "Das Modul  php-ldap wird für die Verbindung mit dem LDAP-Server benötigt.",
+"The php-zip module is needed download multiple files at once" => "Das Modul php-zip wird für den gleichzeitigen Download mehrerer Dateien benötigt.",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "Das Modul  php_mb_multibyte wird benötigt, um das Encoding richtig zu handhaben.",
+"The php-ctype module is needed validate data." => "Das Modul php-ctype wird benötigt, um Daten zu prüfen.",
+"The php-xml module is needed to share files with webdav." => "Das Modul php-xml wird benötigt, um Dateien über WebDAV zu teilen.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Die Richtlinie allow_url_fopen in Ihrer php.ini sollte auf 1 gesetzt werden, um die Wissensbasis vom OCS-Server abrufen.",
+"The php-pdo module is needed to store owncloud data into a database." => "Das Modul php-pdo wird benötigt, um Daten in der Datenbank zu speichern.",
+"Dependencies status" => "Status der Abhängigkeiten",
+"Used by :" => "Benutzt von:"
+);
diff --git a/apps/admin_dependencies_chk/l10n/fr.php b/apps/admin_dependencies_chk/l10n/fr.php
new file mode 100644
index 00000000000..1b195b78bb4
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/fr.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "Le module php-json est requis pour l'inter-communication de nombreux modules.",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Le module php-curl est requis afin de rapatrier le titre des pages lorsque vous ajoutez un marque-pages.",
+"The php-gd module is needed to create thumbnails of your images" => "Le module php-gd est requis afin de permettre la création d'aperçus pour vos images.",
+"The php-ldap module is needed connect to your ldap server" => "Le module php-ldap est requis afin de permettre la connexion à votre serveur ldap.",
+"The php-zip module is needed download multiple files at once" => "Le module php-zip est requis pour le téléchargement simultané de plusieurs fichiers.",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "Le module php-mb_multibyte est requis pour une gestion correcte des encodages.",
+"The php-ctype module is needed validate data." => "Le module php-ctype est requis pour la validation des données.",
+"The php-xml module is needed to share files with webdav." => "Le module php-xml est requis pour le partage de fichiers via webdav.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "La directive allow_url_fopen de votre fichier php.ini doit être à la valeur 1 afin de permettre le rapatriement de la base de connaissance depuis les serveurs OCS.",
+"The php-pdo module is needed to store owncloud data into a database." => "le module php-pdo est requis pour le stockage des données ownCloud en base de données.",
+"Dependencies status" => "Statut des dépendances",
+"Used by :" => "Utilisé par :"
+);
diff --git a/apps/admin_dependencies_chk/l10n/it.php b/apps/admin_dependencies_chk/l10n/it.php
new file mode 100644
index 00000000000..00aeae205bf
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/it.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "Il modulo php-json è richiesto per l'intercomunicazione di diverse applicazioni",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Il modulo php-curl è richiesto per scaricare il titolo della pagina quando si aggiunge un segnalibro",
+"The php-gd module is needed to create thumbnails of your images" => "Il modulo php-gd è richiesto per creare miniature delle tue immagini",
+"The php-ldap module is needed connect to your ldap server" => "Il modulo php-ldap è richiesto per collegarsi a un server ldap",
+"The php-zip module is needed download multiple files at once" => "Il modulo php-zip è richiesto per scaricare diversi file contemporaneamente",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "Il modulo php-mb_multibyte è richiesto per gestire correttamente la codifica.",
+"The php-ctype module is needed validate data." => "Il modulo php-ctype è richiesto per la validazione dei dati.",
+"The php-xml module is needed to share files with webdav." => "Il modulo php-xml è richiesto per condividere i file con webdav.",
+"The php-pdo module is needed to store owncloud data into a database." => "Il modulo php-pdo è richiesto per archiviare i dati di ownCloud in un database.",
+"Dependencies status" => "Stato delle dipendenze",
+"Used by :" => "Usato da:"
+);
diff --git a/apps/admin_dependencies_chk/l10n/sv.php b/apps/admin_dependencies_chk/l10n/sv.php
new file mode 100644
index 00000000000..07868f3c03c
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/sv.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "Modulen php-json behövs av många applikationer som interagerar.",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Modulen php-curl behövs för att hämta sidans titel när du lägger till bokmärken.",
+"The php-gd module is needed to create thumbnails of your images" => "Modulen php-gd behövs för att skapa miniatyrer av dina bilder.",
+"The php-ldap module is needed connect to your ldap server" => "Modulen php-ldap behövs för att ansluta mot din ldapserver.",
+"The php-zip module is needed download multiple files at once" => "Modulen php-zip behövs för att kunna ladda ner flera filer på en gång.",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "Modulen php-mb_multibyte behövs för att hantera korrekt teckenkodning.",
+"The php-ctype module is needed validate data." => "Modulen php-ctype behövs för att validera data.",
+"The php-xml module is needed to share files with webdav." => "Modulen php-xml behövs för att kunna dela filer med webdav.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Direktivet allow_url_fopen i php.ini bör sättas till 1 för att kunna hämta kunskapsbasen från OCS-servrar.",
+"The php-pdo module is needed to store owncloud data into a database." => "Modulen php-pdo behövs för att kunna lagra ownCloud data i en databas.",
+"Dependencies status" => "Beroenden status",
+"Used by :" => "Används av:"
+);
diff --git a/apps/admin_dependencies_chk/l10n/th_TH.php b/apps/admin_dependencies_chk/l10n/th_TH.php
new file mode 100644
index 00000000000..338397cb57c
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/th_TH.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Used by :" => "ใช้งานโดย:"
+);
diff --git a/apps/admin_migrate/l10n/.gitkeep b/apps/admin_migrate/l10n/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/apps/admin_migrate/l10n/.gitkeep
diff --git a/apps/admin_migrate/l10n/ca.php b/apps/admin_migrate/l10n/ca.php
new file mode 100644
index 00000000000..8743b397601
--- /dev/null
+++ b/apps/admin_migrate/l10n/ca.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Exporta aquesta instància de ownCloud",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Això crearà un fitxer comprimit amb les dades d'aquesta instància ownCloud.\n            Escolliu el tipus d'exportació:",
+"Export" => "Exporta"
+);
diff --git a/apps/admin_migrate/l10n/de.php b/apps/admin_migrate/l10n/de.php
new file mode 100644
index 00000000000..d42179b75ad
--- /dev/null
+++ b/apps/admin_migrate/l10n/de.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Diese ownCloud-Instanz exportieren.",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Dies wird eine komprimierte Datei erzeugen, welche die Daten dieser ownCloud-Instanz enthält.\n            Bitte wählen Sie den Exporttyp:",
+"Export" => "Exportieren"
+);
diff --git a/apps/admin_migrate/l10n/es.php b/apps/admin_migrate/l10n/es.php
new file mode 100644
index 00000000000..cb6699b1d94
--- /dev/null
+++ b/apps/admin_migrate/l10n/es.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Exportar esta instancia de ownCloud",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Se creará un archivo comprimido que contendrá los datos de esta instancia de owncloud.\n            Por favor elegir el tipo de exportación:",
+"Export" => "Exportar"
+);
diff --git a/apps/admin_migrate/l10n/fr.php b/apps/admin_migrate/l10n/fr.php
new file mode 100644
index 00000000000..0cf0a444b0e
--- /dev/null
+++ b/apps/admin_migrate/l10n/fr.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Exporter cette instance ownCloud",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Ceci va créer une archive compressée contenant les données de cette instance ownCloud.\n            Veuillez choisir le type d'export :",
+"Export" => "Exporter"
+);
diff --git a/apps/admin_migrate/l10n/gl.php b/apps/admin_migrate/l10n/gl.php
new file mode 100644
index 00000000000..9d18e134938
--- /dev/null
+++ b/apps/admin_migrate/l10n/gl.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Exporta esta instancia de ownCloud",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Esto creará un ficheiro comprimido que contén os datos de esta instancia de ownCloud.\nPor favor escolla o modo de exportación:",
+"Export" => "Exportar"
+);
diff --git a/apps/admin_migrate/l10n/it.php b/apps/admin_migrate/l10n/it.php
new file mode 100644
index 00000000000..78d2074bcad
--- /dev/null
+++ b/apps/admin_migrate/l10n/it.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Esporta questa istanza di ownClou",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Questa operazione creerà un file compresso che contiene i dati dell'istanza di ownCloud. Scegli il tipo di esportazione:",
+"Export" => "Esporta"
+);
diff --git a/apps/admin_migrate/l10n/pl.php b/apps/admin_migrate/l10n/pl.php
new file mode 100644
index 00000000000..292601daa2b
--- /dev/null
+++ b/apps/admin_migrate/l10n/pl.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Eksportuj instancję ownCloud",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Spowoduje to utworzenie pliku skompresowanego, który zawiera dane tej instancji ownCloud.⏎ proszę wybrać typ eksportu:",
+"Export" => "Eksport"
+);
diff --git a/apps/admin_migrate/l10n/sv.php b/apps/admin_migrate/l10n/sv.php
new file mode 100644
index 00000000000..57866e897e6
--- /dev/null
+++ b/apps/admin_migrate/l10n/sv.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Exportera denna instans av ownCloud",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Detta kommer att skapa en komprimerad fil som innehåller all data från denna instans av ownCloud.\n            Välj exporttyp:",
+"Export" => "Exportera"
+);
diff --git a/apps/admin_migrate/l10n/th_TH.php b/apps/admin_migrate/l10n/th_TH.php
new file mode 100644
index 00000000000..9dfaca15b5e
--- /dev/null
+++ b/apps/admin_migrate/l10n/th_TH.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "ส่งออกข้อมูลค่าสมมุติของ ownCloud นี้",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "ส่วนนี้จะเป็นการสร้างไฟล์บีบอัดที่บรรจุข้อมูลค่าสมมุติของ ownCloud.\n            กรุณาเลือกชนิดของการส่งออกข้อมูล:",
+"Export" => "ส่งออก"
+);
diff --git a/apps/bookmarks/l10n/th_TH.php b/apps/bookmarks/l10n/th_TH.php
new file mode 100644
index 00000000000..64a148efabc
--- /dev/null
+++ b/apps/bookmarks/l10n/th_TH.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "รายการโปรด",
+"unnamed" => "ยังไม่มีชื่อ",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "ลากสิ่งนี้ไปไว้ที่รายการโปรดในโปรแกรมบราวเซอร์ของคุณ แล้วคลิกที่นั่น, เมื่อคุณต้องการเก็บหน้าเว็บเพจเข้าไปไว้ในรายการโปรดอย่างรวดเร็ว",
+"Read later" => "อ่านภายหลัง",
+"Address" => "ที่อยู่",
+"Title" => "ชื่อ",
+"Tags" => "ป้ายกำกับ",
+"Save bookmark" => "บันทึกรายการโปรด",
+"You have no bookmarks" => "คุณยังไม่มีรายการโปรด",
+"Bookmarklet <br />" => "Bookmarklet <br />"
+);
diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php
index 6669d7ce2c4..dd605072ce7 100644
--- a/apps/calendar/appinfo/remote.php
+++ b/apps/calendar/appinfo/remote.php
@@ -21,12 +21,15 @@ $principalBackend = new OC_Connector_Sabre_Principal();
 $caldavBackend    = new OC_Connector_Sabre_CalDAV();
 
 // Root nodes
-$collection = new Sabre_CalDAV_Principal_Collection($principalBackend); 
-$collection->disableListing = true; // Disable listening
+$Sabre_CalDAV_Principal_Collection = new Sabre_CalDAV_Principal_Collection($principalBackend); 
+$Sabre_CalDAV_Principal_Collection->disableListing = true; // Disable listening
+
+$Sabre_CalDAV_CalendarRootNode = new Sabre_CalDAV_CalendarRootNode($principalBackend, $caldavBackend); 
+$Sabre_CalDAV_CalendarRootNode->disableListing = true; // Disable listening
 
 $nodes = array( 
-	$collection, 
-	new Sabre_CalDAV_CalendarRootNode($principalBackend, $caldavBackend),
+	$Sabre_CalDAV_Principal_Collection, 
+	$Sabre_CalDAV_CalendarRootNode,
 	);
 
 // Fire up server
diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css
index 5cda4b1beff..64a779b9a9f 100644
--- a/apps/calendar/css/style.css
+++ b/apps/calendar/css/style.css
@@ -40,8 +40,6 @@
 .thisday{background: #FFFABC;}
 .event {position:relative;}
 .event.colored {border-bottom: 1px solid white;}
-.popup {display: none; position: absolute; z-index: 1000; background: #eeeeee; color: #000000; border: 1px solid #1a1a1a; font-size: 90%;}
-.event_popup {width: 280px; height: 40px; padding: 10px;}
 
 input[type="button"].active {color: #6193CF}
 #fromtime, #totime {
diff --git a/apps/calendar/l10n/ar.php b/apps/calendar/l10n/ar.php
index 679f1102853..524def22f74 100644
--- a/apps/calendar/l10n/ar.php
+++ b/apps/calendar/l10n/ar.php
@@ -19,6 +19,7 @@
 "Projects" => "مشاريع",
 "Questions" => "اسئلة",
 "Work" => "العمل",
+"New Calendar" => "جدول زمني جديد",
 "Does not repeat" => "لا يعاد",
 "Daily" => "يومي",
 "Weekly" => "أسبوعي",
@@ -64,7 +65,6 @@
 "Date" => "تاريخ",
 "Cal." => "تقويم",
 "All day" => "كل النهار",
-"New Calendar" => "جدول زمني جديد",
 "Missing fields" => "خانات خالية من المعلومات",
 "Title" => "عنوان",
 "From Date" => "من تاريخ",
@@ -77,9 +77,6 @@
 "Month" => "شهر",
 "List" => "قائمة",
 "Today" => "اليوم",
-"Calendars" => "الجداول الزمنية",
-"There was a fail, while parsing the file." => "لم يتم قراءة الملف بنجاح.",
-"Choose active calendars" => "إختر الجدول الزمني الرئيسي",
 "CalDav Link" => "وصلة CalDav",
 "Download" => "تحميل",
 "Edit" => "تعديل",
@@ -116,20 +113,13 @@
 "Interval" => "المده الفاصله",
 "End" => "نهايه",
 "occurrences" => "الاحداث",
-"Import a calendar file" => "أدخل ملف التقويم",
-"Please choose the calendar" => "الرجاء إختر الجدول الزمني",
 "create a new calendar" => "انشاء جدول زمني جديد",
+"Import a calendar file" => "أدخل ملف التقويم",
 "Name of new calendar" => "أسم الجدول الزمني الجديد",
 "Import" => "إدخال",
-"Importing calendar" => "يتم ادخال الجدول الزمني",
-"Calendar imported successfully" => "تم ادخال الجدول الزمني بنجاح",
 "Close Dialog" => "أغلق الحوار",
 "Create a new event" => "إضافة حدث جديد",
-"Select category" => "اختر الفئة",
 "Timezone" => "المنطقة الزمنية",
-"Check always for changes of the timezone" => "راقب دائما تغير التقويم الزمني",
-"Timeformat" => "شكل الوقت",
 "24h" => "24 ساعة",
-"12h" => "12 ساعة",
-"Calendar CalDAV syncing address:" => "عنوان لتحديث ال CalDAV الجدول الزمني"
+"12h" => "12 ساعة"
 );
diff --git a/apps/calendar/l10n/bg_BG.php b/apps/calendar/l10n/bg_BG.php
index 592502b2687..fc353ebef95 100644
--- a/apps/calendar/l10n/bg_BG.php
+++ b/apps/calendar/l10n/bg_BG.php
@@ -40,9 +40,6 @@
 "Month" => "Месец",
 "List" => "Списък",
 "Today" => "Днес",
-"Calendars" => "Календари",
-"There was a fail, while parsing the file." => "Възникна проблем с разлистването на файла.",
-"Choose active calendars" => "Изберете активен календар",
 "Your calendars" => "Вашите календари",
 "Shared calendars" => "Споделени календари",
 "No shared calendars" => "Няма споделени календари",
@@ -83,6 +80,5 @@
 "View an event" => "Преглед на събитие",
 "No categories selected" => "Няма избрани категории",
 "Timezone" => "Часова зона",
-"First day of the week" => "Първи ден на седмицата",
 "Groups" => "Групи"
 );
diff --git a/apps/calendar/l10n/ca.php b/apps/calendar/l10n/ca.php
index d999eaf4739..9e267604e62 100644
--- a/apps/calendar/l10n/ca.php
+++ b/apps/calendar/l10n/ca.php
@@ -112,9 +112,7 @@
 "Month" => "Mes",
 "List" => "Llista",
 "Today" => "Avui",
-"Calendars" => "Calendaris",
-"There was a fail, while parsing the file." => "S'ha produït un error en analitzar el fitxer.",
-"Choose active calendars" => "Seleccioneu calendaris actius",
+"Settings" => "Configuració",
 "Your calendars" => "Els vostres calendaris",
 "CalDav Link" => "Enllaç CalDav",
 "Shared calendars" => "Calendaris compartits",
@@ -176,14 +174,16 @@
 "No categories selected" => "No hi ha categories seleccionades",
 "of" => "de",
 "at" => "a",
+"General" => "General",
 "Timezone" => "Zona horària",
-"Check always for changes of the timezone" => "Comprova sempre en els canvis de zona horària",
-"Timeformat" => "Format de temps",
+"Update timezone automatically" => "Actualitza la zona horària automàticament",
+"Time format" => "Format horari",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Primer dia de la setmana",
+"Start week on" => "Comença la setmana en ",
 "Cache" => "Memòria de cau",
 "Clear cache for repeating events" => "Neteja la memòria de cau pels esdeveniments amb repetició",
+"URLs" => "URLs",
 "Calendar CalDAV syncing addresses" => "Adreça de sincronització del calendari CalDAV",
 "more info" => "més informació",
 "Primary address (Kontact et al)" => "Adreça primària (Kontact et al)",
diff --git a/apps/calendar/l10n/cs_CZ.php b/apps/calendar/l10n/cs_CZ.php
index 05d286d82c1..fcc31613c79 100644
--- a/apps/calendar/l10n/cs_CZ.php
+++ b/apps/calendar/l10n/cs_CZ.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Časová zóna byla změněna",
 "Invalid request" => "Chybný požadavek",
 "Calendar" => "Kalendář",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM rrrr",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d. MMM[ yyyy]{ '&#8212;' d.[ MMM] yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, rrrr",
 "Birthday" => "Narozeniny",
 "Business" => "Obchodní",
 "Call" => "Hovor",
@@ -23,6 +28,7 @@
 "Questions" => "Dotazy",
 "Work" => "Pracovní",
 "unnamed" => "nepojmenováno",
+"New Calendar" => "Nový kalendář",
 "Does not repeat" => "Neopakuje se",
 "Daily" => "Denně",
 "Weekly" => "Týdně",
@@ -68,7 +74,6 @@
 "Date" => "Datum",
 "Cal." => "Kal.",
 "All day" => "Celý den",
-"New Calendar" => "Nový kalendář",
 "Missing fields" => "Chybějící pole",
 "Title" => "Název",
 "From Date" => "Od data",
@@ -81,9 +86,6 @@
 "Month" => "měsíc",
 "List" => "Seznam",
 "Today" => "dnes",
-"Calendars" => "Kalendáře",
-"There was a fail, while parsing the file." => "Chyba při převodu souboru",
-"Choose active calendars" => "Vybrat aktivní kalendář",
 "Your calendars" => "Vaše kalendáře",
 "CalDav Link" => "CalDav odkaz",
 "Shared calendars" => "Sdílené kalendáře",
@@ -132,27 +134,19 @@
 "Interval" => "Interval",
 "End" => "Konec",
 "occurrences" => "výskyty",
-"Import a calendar file" => "Importovat soubor kalendáře",
-"Please choose the calendar" => "Zvolte prosím kalendář",
 "create a new calendar" => "vytvořit nový kalendář",
+"Import a calendar file" => "Importovat soubor kalendáře",
 "Name of new calendar" => "Název nového kalendáře",
 "Import" => "Import",
-"Importing calendar" => "Kalendář se importuje",
-"Calendar imported successfully" => "Kalendář byl úspěšně importován",
 "Close Dialog" => "Zavřít dialog",
 "Create a new event" => "Vytvořit novou událost",
 "View an event" => "Zobrazit událost",
 "No categories selected" => "Žádné kategorie nevybrány",
-"Select category" => "Vyberte kategorii",
 "of" => "z",
 "at" => "v",
 "Timezone" => "Časové pásmo",
-"Check always for changes of the timezone" => "Vždy kontrolavat, zda nedošlo ke změně časového pásma",
-"Timeformat" => "Formát času",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Týden začína v",
-"Calendar CalDAV syncing address:" => "Adresa pro synchronizaci kalendáře pomocí CalDAV:",
 "Users" => "Uživatelé",
 "select users" => "vybrat uživatele",
 "Editable" => "Upravovatelné",
diff --git a/apps/calendar/l10n/da.php b/apps/calendar/l10n/da.php
index 36551a2a93a..789765fec43 100644
--- a/apps/calendar/l10n/da.php
+++ b/apps/calendar/l10n/da.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Tidszone ændret",
 "Invalid request" => "Ugyldig forespørgsel",
 "Calendar" => "Kalender",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM åååå",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ åååå]{ '&#8212;'[ MMM] d åååå}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, åååå",
 "Birthday" => "Fødselsdag",
 "Business" => "Forretning",
 "Call" => "Ring",
@@ -22,7 +27,9 @@
 "Projects" => "Projekter",
 "Questions" => "Spørgsmål",
 "Work" => "Arbejde",
+"by" => "af",
 "unnamed" => "unavngivet",
+"New Calendar" => "Ny Kalender",
 "Does not repeat" => "Gentages ikke",
 "Daily" => "Daglig",
 "Weekly" => "Ugentlig",
@@ -67,8 +74,26 @@
 "by day and month" => "efter dag og måned",
 "Date" => "Dato",
 "Cal." => "Kal.",
+"Sun." => "Søn.",
+"Mon." => "Man.",
+"Tue." => "Tir.",
+"Wed." => "Ons.",
+"Thu." => "Tor.",
+"Fri." => "Fre.",
+"Sat." => "Lør.",
+"Jan." => "Jan.",
+"Feb." => "Feb.",
+"Mar." => "Mar.",
+"Apr." => "Apr.",
+"May." => "Maj",
+"Jun." => "Jun.",
+"Jul." => "Jul.",
+"Aug." => "Aug.",
+"Sep." => "Sep.",
+"Oct." => "Okt.",
+"Nov." => "Nov.",
+"Dec." => "Dec.",
 "All day" => "Hele dagen",
-"New Calendar" => "Ny Kalender",
 "Missing fields" => "Manglende felter",
 "Title" => "Titel",
 "From Date" => "Fra dato",
@@ -81,9 +106,6 @@
 "Month" => "Måned",
 "List" => "Liste",
 "Today" => "I dag",
-"Calendars" => "Kalendere",
-"There was a fail, while parsing the file." => "Der opstod en fejl under gennemlæsning af filen.",
-"Choose active calendars" => "Vælg aktive kalendere",
 "Your calendars" => "Dine kalendere",
 "CalDav Link" => "CalDav-link",
 "Shared calendars" => "Delte kalendere",
@@ -132,27 +154,22 @@
 "Interval" => "Interval",
 "End" => "Afslutning",
 "occurrences" => "forekomster",
-"Import a calendar file" => "Importer en kalenderfil",
-"Please choose the calendar" => "Vælg venligst kalender",
 "create a new calendar" => "opret en ny kalender",
+"Import a calendar file" => "Importer en kalenderfil",
+"Please choose a calendar" => "Vælg en kalender",
 "Name of new calendar" => "Navn på ny kalender",
 "Import" => "Importer",
-"Importing calendar" => "Importerer kalender",
-"Calendar imported successfully" => "Kalender importeret korrekt",
 "Close Dialog" => "Luk dialog",
 "Create a new event" => "Opret en ny begivenhed",
 "View an event" => "Vis en begivenhed",
 "No categories selected" => "Ingen categorier valgt",
-"Select category" => "Vælg kategori",
 "of" => "fra",
 "at" => "kl.",
 "Timezone" => "Tidszone",
-"Check always for changes of the timezone" => "Check altid efter ændringer i tidszone",
-"Timeformat" => "Tidsformat",
 "24h" => "24T",
 "12h" => "12T",
-"First day of the week" => "Ugens første dag",
-"Calendar CalDAV syncing address:" => "Synkroniseringsadresse til CalDAV:",
+"more info" => "flere oplysninger",
+"iOS/OS X" => "iOS/OS X",
 "Users" => "Brugere",
 "select users" => "Vælg brugere",
 "Editable" => "Redigerbar",
diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php
index 8270b6785e4..cd148d757f7 100644
--- a/apps/calendar/l10n/de.php
+++ b/apps/calendar/l10n/de.php
@@ -112,9 +112,7 @@
 "Month" => "Monat",
 "List" => "Liste",
 "Today" => "Heute",
-"Calendars" => "Kalender",
-"There was a fail, while parsing the file." => "Fehler beim Einlesen der Datei.",
-"Choose active calendars" => "Aktive Kalender wählen",
+"Settings" => "Einstellungen",
 "Your calendars" => "Deine Kalender",
 "CalDav Link" => "CalDAV-Link",
 "Shared calendars" => "geteilte Kalender",
@@ -176,15 +174,17 @@
 "No categories selected" => "Keine Kategorie ausgewählt",
 "of" => "von",
 "at" => "um",
+"General" => "Allgemein",
 "Timezone" => "Zeitzone",
-"Check always for changes of the timezone" => "immer die Zeitzone überprüfen",
-"Timeformat" => "Zeitformat",
+"Update timezone automatically" => "Zeitzone automatisch aktualisieren",
+"Time format" => "Zeitformat",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "erster Wochentag",
+"Start week on" => "Erster Wochentag",
 "Cache" => "Zwischenspeicher",
-"Clear cache for repeating events" => "Lösche den Zwischenspeicher für wiederholende Veranstaltungen.",
-"Calendar CalDAV syncing addresses" => "CalDAV-Kalender gleicht Adressen ab.",
+"Clear cache for repeating events" => "Lösche den Zwischenspeicher für wiederholende Veranstaltungen",
+"URLs" => "URLs",
+"Calendar CalDAV syncing addresses" => "CalDAV-Kalender gleicht Adressen ab",
 "more info" => "weitere Informationen",
 "Primary address (Kontact et al)" => "Primäre Adresse (Kontakt u.a.)",
 "iOS/OS X" => "iOS/OS X",
diff --git a/apps/calendar/l10n/el.php b/apps/calendar/l10n/el.php
index 46572138485..ad07d7b5855 100644
--- a/apps/calendar/l10n/el.php
+++ b/apps/calendar/l10n/el.php
@@ -112,9 +112,6 @@
 "Month" => "Μήνας",
 "List" => "Λίστα",
 "Today" => "Σήμερα",
-"Calendars" => "Ημερολόγια",
-"There was a fail, while parsing the file." => "Υπήρξε μια αποτυχία, κατά την σάρωση του αρχείου.",
-"Choose active calendars" => "Επιλέξτε τα ενεργά ημερολόγια",
 "Your calendars" => "Τα ημερολόγια σου",
 "CalDav Link" => "Σύνδεση CalDAV",
 "Shared calendars" => "Κοινόχρηστα ημερολόγια",
@@ -177,11 +174,8 @@
 "of" => "του",
 "at" => "στο",
 "Timezone" => "Ζώνη ώρας",
-"Check always for changes of the timezone" => "Έλεγχος πάντα για τις αλλαγές της ζώνης ώρας",
-"Timeformat" => "Μορφή ώρας",
 "24h" => "24ω",
 "12h" => "12ω",
-"First day of the week" => "Πρώτη μέρα της εβδομάδας",
 "Cache" => "Cache",
 "Clear cache for repeating events" => "Εκκαθάριση λανθάνουσας μνήμης για επανάληψη γεγονότων",
 "Calendar CalDAV syncing addresses" => "Διευθύνσεις συγχρονισμού ημερολογίου CalDAV",
diff --git a/apps/calendar/l10n/eo.php b/apps/calendar/l10n/eo.php
index b1127d59ca9..1a01bb713f9 100644
--- a/apps/calendar/l10n/eo.php
+++ b/apps/calendar/l10n/eo.php
@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Ne ĉiuj kalendaroj estas tute kaŝmemorigitaj",
+"Everything seems to be completely cached" => "Ĉio ŝajnas tute kaŝmemorigita",
 "No calendars found." => "Neniu kalendaro troviĝis.",
 "No events found." => "Neniu okazaĵo troviĝis.",
 "Wrong calendar" => "Malĝusta kalendaro",
+"The file contained either no events or all events are already saved in your calendar." => "Aŭ la dosiero enhavas neniun okazaĵon aŭ ĉiuj okazaĵoj jam estas konservitaj en via kalendaro.",
+"events has been saved in the new calendar" => "okazaĵoj estas konservitaj en la nova kalendaro",
+"Import failed" => "Enporto malsukcesis",
+"events has been saved in your calendar" => "okazaĵoj estas konservitaj en via kalendaro",
 "New Timezone:" => "Nova horzono:",
 "Timezone changed" => "La horozono estas ŝanĝita",
 "Invalid request" => "Nevalida peto",
 "Calendar" => "Kalendaro",
+"ddd" => "ddd",
+"ddd M/d" => "ddd d/M",
+"dddd M/d" => "dddd d/M",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d MMM[ yyyy]{ '&#8212;'d[ MMM] yyyy}",
+"dddd, MMM d, yyyy" => "dddd, d-a de MMM yyyy",
 "Birthday" => "Naskiĝotago",
 "Business" => "Negoco",
 "Call" => "Voko",
@@ -22,7 +33,9 @@
 "Projects" => "Projektoj",
 "Questions" => "Demandoj",
 "Work" => "Laboro",
+"by" => "de",
 "unnamed" => "nenomita",
+"New Calendar" => "Nova kalendaro",
 "Does not repeat" => "Ĉi tio ne ripetiĝas",
 "Daily" => "Tage",
 "Weekly" => "Semajne",
@@ -67,8 +80,26 @@
 "by day and month" => "laŭ tago kaj monato",
 "Date" => "Dato",
 "Cal." => "Kal.",
+"Sun." => "dim.",
+"Mon." => "lun.",
+"Tue." => "mar.",
+"Wed." => "mer.",
+"Thu." => "ĵaŭ.",
+"Fri." => "ven.",
+"Sat." => "sab.",
+"Jan." => "Jan.",
+"Feb." => "Feb.",
+"Mar." => "Mar.",
+"Apr." => "Apr.",
+"May." => "Maj.",
+"Jun." => "Jun.",
+"Jul." => "Jul.",
+"Aug." => "Aŭg.",
+"Sep." => "Sep.",
+"Oct." => "Okt.",
+"Nov." => "Nov.",
+"Dec." => "Dec.",
 "All day" => "La tuta tago",
-"New Calendar" => "Nova kalendaro",
 "Missing fields" => "Mankas iuj kampoj",
 "Title" => "Titolo",
 "From Date" => "ekde la dato",
@@ -81,9 +112,6 @@
 "Month" => "Monato",
 "List" => "Listo",
 "Today" => "Hodiaŭ",
-"Calendars" => "Kalendaroj",
-"There was a fail, while parsing the file." => "Malsukceso okazis dum analizo de la dosiero.",
-"Choose active calendars" => "Elektu aktivajn kalendarojn",
 "Your calendars" => "Viaj kalendaroj",
 "CalDav Link" => "CalDav-a ligilo",
 "Shared calendars" => "Kunhavigitaj kalendaroj",
@@ -132,27 +160,29 @@
 "Interval" => "Intervalo",
 "End" => "Fino",
 "occurrences" => "aperoj",
-"Import a calendar file" => "Enporti kalendarodosieron",
-"Please choose the calendar" => "Bonvolu elekti kalendaron",
 "create a new calendar" => "Krei novan kalendaron",
+"Import a calendar file" => "Enporti kalendarodosieron",
+"Please choose a calendar" => "Bonvolu elekti kalendaron",
 "Name of new calendar" => "Nomo de la nova kalendaro",
+"Take an available name!" => "Prenu haveblan nomon!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Kalendaro kun ĉi tiu nomo jam ekzastas. Se vi malgraŭe daŭros, ĉi tiuj kalendaroj kunfandiĝos.",
 "Import" => "Enporti",
-"Importing calendar" => "Kalendaro estas enportata",
-"Calendar imported successfully" => "La kalendaro enportiĝis sukcese",
 "Close Dialog" => "Fermi la dialogon",
 "Create a new event" => "Krei okazaĵon",
 "View an event" => "Vidi okazaĵon",
 "No categories selected" => "Neniu kategorio elektita",
-"Select category" => "Elekti kategorion",
 "of" => "de",
 "at" => "ĉe",
 "Timezone" => "Horozono",
-"Check always for changes of the timezone" => "Ĉiam kontroli ĉu la horzono ŝanĝiĝis",
-"Timeformat" => "Tempoformo",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Unua tago de la semajno",
-"Calendar CalDAV syncing address:" => "Adreso de kalendarosinkronigo per CalDAV:",
+"Cache" => "Kaŝmemoro",
+"Clear cache for repeating events" => "Forviŝi kaŝmemoron por ripeto de okazaĵoj",
+"Calendar CalDAV syncing addresses" => "sinkronigaj adresoj por CalDAV-kalendaroj",
+"more info" => "pli da informo",
+"Primary address (Kontact et al)" => "Ĉefa adreso (Kontact kaj aliaj)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Nurlegebla(j) iCalendar-ligilo(j)",
 "Users" => "Uzantoj",
 "select users" => "elekti uzantojn",
 "Editable" => "Redaktebla",
diff --git a/apps/calendar/l10n/es.php b/apps/calendar/l10n/es.php
index 4cd9e3202bf..3ebcd2e9430 100644
--- a/apps/calendar/l10n/es.php
+++ b/apps/calendar/l10n/es.php
@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Aún no se han guardado en caché todos los calendarios",
+"Everything seems to be completely cached" => "Parece que se ha guardado todo en caché",
 "No calendars found." => "No se encontraron calendarios.",
 "No events found." => "No se encontraron eventos.",
 "Wrong calendar" => "Calendario incorrecto",
+"The file contained either no events or all events are already saved in your calendar." => "El archivo no contiene eventos o ya existen en tu calendario.",
+"events has been saved in the new calendar" => "Los eventos han sido guardados en el nuevo calendario",
+"Import failed" => "Fallo en la importación",
+"events has been saved in your calendar" => "eventos se han guardado en tu calendario",
 "New Timezone:" => "Nueva zona horaria:",
 "Timezone changed" => "Zona horaria cambiada",
 "Invalid request" => "Petición no válida",
 "Calendar" => "Calendario",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "Cumpleaños",
 "Business" => "Negocios",
 "Call" => "Llamada",
@@ -22,7 +33,9 @@
 "Projects" => "Proyectos",
 "Questions" => "Preguntas",
 "Work" => "Trabajo",
+"by" => "por",
 "unnamed" => "Sin nombre",
+"New Calendar" => "Nuevo calendario",
 "Does not repeat" => "No se repite",
 "Daily" => "Diariamente",
 "Weekly" => "Semanalmente",
@@ -67,8 +80,26 @@
 "by day and month" => "por día y mes",
 "Date" => "Fecha",
 "Cal." => "Cal.",
+"Sun." => "Dom.",
+"Mon." => "Lun.",
+"Tue." => "Mar.",
+"Wed." => "Mier.",
+"Thu." => "Jue.",
+"Fri." => "Vie.",
+"Sat." => "Sab.",
+"Jan." => "Ene.",
+"Feb." => "Feb.",
+"Mar." => "Mar.",
+"Apr." => "Abr.",
+"May." => "May.",
+"Jun." => "Jun.",
+"Jul." => "Jul.",
+"Aug." => "Ago.",
+"Sep." => "Sep.",
+"Oct." => "Oct.",
+"Nov." => "Nov.",
+"Dec." => "Dic.",
 "All day" => "Todo el día",
-"New Calendar" => "Nuevo calendario",
 "Missing fields" => "Los campos que faltan",
 "Title" => "Título",
 "From Date" => "Desde la fecha",
@@ -81,9 +112,6 @@
 "Month" => "Mes",
 "List" => "Lista",
 "Today" => "Hoy",
-"Calendars" => "Calendarios",
-"There was a fail, while parsing the file." => "Se ha producido un fallo al analizar el archivo.",
-"Choose active calendars" => "Elige los calendarios activos",
 "Your calendars" => "Tus calendarios",
 "CalDav Link" => "Enlace a CalDav",
 "Shared calendars" => "Calendarios compartidos",
@@ -132,27 +160,29 @@
 "Interval" => "Intervalo",
 "End" => "Fin",
 "occurrences" => "ocurrencias",
-"Import a calendar file" => "Importar un archivo de calendario",
-"Please choose the calendar" => "Por favor elige el calendario",
 "create a new calendar" => "Crear un nuevo calendario",
+"Import a calendar file" => "Importar un archivo de calendario",
+"Please choose a calendar" => "Por favor, escoge un calendario",
 "Name of new calendar" => "Nombre del nuevo calendario",
+"Take an available name!" => "¡Elige un nombre disponible!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Ya existe un calendario con este nombre. Si continúas, se combinarán los calendarios.",
 "Import" => "Importar",
-"Importing calendar" => "Importando calendario",
-"Calendar imported successfully" => "Calendario importado exitosamente",
 "Close Dialog" => "Cerrar diálogo",
 "Create a new event" => "Crear un nuevo evento",
 "View an event" => "Ver un evento",
 "No categories selected" => "Ninguna categoría seleccionada",
-"Select category" => "Seleccionar categoría",
 "of" => "de",
 "at" => "a las",
 "Timezone" => "Zona horaria",
-"Check always for changes of the timezone" => "Comprobar siempre por cambios en la zona horaria",
-"Timeformat" => "Formato de hora",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Primer día de la semana",
-"Calendar CalDAV syncing address:" => "Dirección de sincronización de calendario CalDAV:",
+"Cache" => "Caché",
+"Clear cache for repeating events" => "Limpiar caché de eventos recurrentes",
+"Calendar CalDAV syncing addresses" => "Direcciones de sincronización de calendario CalDAV:",
+"more info" => "Más información",
+"Primary address (Kontact et al)" => "Dirección principal (Kontact y otros)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Enlace(s) iCalendar de sólo lectura",
 "Users" => "Usuarios",
 "select users" => "seleccionar usuarios",
 "Editable" => "Editable",
diff --git a/apps/calendar/l10n/et_EE.php b/apps/calendar/l10n/et_EE.php
index 931ca56f5fd..59f494f8ab9 100644
--- a/apps/calendar/l10n/et_EE.php
+++ b/apps/calendar/l10n/et_EE.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Ajavöönd on muudetud",
 "Invalid request" => "Vigane päring",
 "Calendar" => "Kalender",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "Sünnipäev",
 "Business" => "Äri",
 "Call" => "Helista",
@@ -23,6 +28,7 @@
 "Questions" => "Küsimused",
 "Work" => "Töö",
 "unnamed" => "nimetu",
+"New Calendar" => "Uus kalender",
 "Does not repeat" => "Ei kordu",
 "Daily" => "Iga päev",
 "Weekly" => "Iga nädal",
@@ -68,7 +74,6 @@
 "Date" => "Kuupäev",
 "Cal." => "Kal.",
 "All day" => "Kogu päev",
-"New Calendar" => "Uus kalender",
 "Missing fields" => "Puuduvad väljad",
 "Title" => "Pealkiri",
 "From Date" => "Alates kuupäevast",
@@ -81,9 +86,6 @@
 "Month" => "Kuu",
 "List" => "Nimekiri",
 "Today" => "Täna",
-"Calendars" => "Kalendrid",
-"There was a fail, while parsing the file." => "Faili parsimisel tekkis viga.",
-"Choose active calendars" => "Vali aktiivsed kalendrid",
 "Your calendars" => "Sinu kalendrid",
 "CalDav Link" => "CalDav Link",
 "Shared calendars" => "Jagatud kalendrid",
@@ -132,27 +134,19 @@
 "Interval" => "Intervall",
 "End" => "Lõpp",
 "occurrences" => "toimumiskordi",
-"Import a calendar file" => "Impordi kalendrifail",
-"Please choose the calendar" => "Palun vali kalender",
 "create a new calendar" => "loo uus kalender",
+"Import a calendar file" => "Impordi kalendrifail",
 "Name of new calendar" => "Uue kalendri nimi",
 "Import" => "Impordi",
-"Importing calendar" => "Kalendri importimine",
-"Calendar imported successfully" => "Kalender on imporditud",
 "Close Dialog" => "Sulge dialoogiaken",
 "Create a new event" => "Loo sündmus",
 "View an event" => "Vaata üritust",
 "No categories selected" => "Ühtegi kategooriat pole valitud",
-"Select category" => "Salvesta kategooria",
 "of" => "/",
 "at" => "kell",
 "Timezone" => "Ajavöönd",
-"Check always for changes of the timezone" => "Kontrolli alati muudatusi ajavööndis",
-"Timeformat" => "Aja vorming",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Nädala esimene päev",
-"Calendar CalDAV syncing address:" => "Kalendri CalDAV sünkroniseerimise aadress:",
 "Users" => "Kasutajad",
 "select users" => "valitud kasutajad",
 "Editable" => "Muudetav",
diff --git a/apps/calendar/l10n/eu.php b/apps/calendar/l10n/eu.php
index 9e1300032f8..5ebce09c58b 100644
--- a/apps/calendar/l10n/eu.php
+++ b/apps/calendar/l10n/eu.php
@@ -1,11 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Egutegi guztiak ez daude guztiz cacheatuta",
+"Everything seems to be completely cached" => "Dena guztiz cacheatuta dagoela dirudi",
 "No calendars found." => "Ez da egutegirik aurkitu.",
 "No events found." => "Ez da gertaerarik aurkitu.",
 "Wrong calendar" => "Egutegi okerra",
+"The file contained either no events or all events are already saved in your calendar." => "Fitxategiak ez zuen gertaerarik edo gertaera guztiak dagoeneko egutegian gordeta zeuden.",
+"events has been saved in the new calendar" => "gertaerak egutegi berrian gorde dira",
+"Import failed" => "Inportazioak huts egin du",
+"events has been saved in your calendar" => "gertaerak zure egutegian gorde dira",
 "New Timezone:" => "Ordu-zonalde berria",
 "Timezone changed" => "Ordu-zonaldea aldatuta",
 "Invalid request" => "Baliogabeko eskaera",
 "Calendar" => "Egutegia",
+"MMMM yyyy" => "yyyy MMMM",
 "Birthday" => "Jaioteguna",
 "Business" => "Negozioa",
 "Call" => "Deia",
@@ -22,6 +29,7 @@
 "Questions" => "Galderak",
 "Work" => "Lana",
 "unnamed" => "izengabea",
+"New Calendar" => "Egutegi berria",
 "Does not repeat" => "Ez da errepikatzen",
 "Daily" => "Egunero",
 "Weekly" => "Astero",
@@ -66,8 +74,26 @@
 "by day and month" => "eguna eta hilabetearen arabera",
 "Date" => "Data",
 "Cal." => "Eg.",
+"Sun." => "ig.",
+"Mon." => "al.",
+"Tue." => "ar.",
+"Wed." => "az.",
+"Thu." => "og.",
+"Fri." => "ol.",
+"Sat." => "lr.",
+"Jan." => "urt.",
+"Feb." => "ots.",
+"Mar." => "mar.",
+"Apr." => "api.",
+"May." => "mai.",
+"Jun." => "eka.",
+"Jul." => "uzt.",
+"Aug." => "abu.",
+"Sep." => "ira.",
+"Oct." => "urr.",
+"Nov." => "aza.",
+"Dec." => "abe.",
 "All day" => "Egun guztia",
-"New Calendar" => "Egutegi berria",
 "Missing fields" => "Eremuak faltan",
 "Title" => "Izenburua",
 "From Date" => "Hasierako Data",
@@ -80,9 +106,6 @@
 "Month" => "Hilabetea",
 "List" => "Zerrenda",
 "Today" => "Gaur",
-"Calendars" => "Egutegiak",
-"There was a fail, while parsing the file." => "Huts bat egon da, fitxategia aztertzen zen bitartea.",
-"Choose active calendars" => "Aukeratu egutegi aktiboak",
 "Your calendars" => "Zure egutegiak",
 "CalDav Link" => "CalDav lotura",
 "Shared calendars" => "Elkarbanatutako egutegiak",
@@ -131,25 +154,26 @@
 "Interval" => "Tartea",
 "End" => "Amaiera",
 "occurrences" => "errepikapenak",
-"Import a calendar file" => "Inportatu egutegi fitxategi bat",
-"Please choose the calendar" => "Mesedez aukeratu egutegia",
 "create a new calendar" => "sortu egutegi berria",
+"Import a calendar file" => "Inportatu egutegi fitxategi bat",
+"Please choose a calendar" => "Mesedez aukeratu egutegi bat.",
 "Name of new calendar" => "Egutegi berriaren izena",
+"Take an available name!" => "Hartu eskuragarri dagoen izen bat!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Izen hau duen egutegi bat dagoeneko existitzen da. Hala ere jarraitzen baduzu, egutegi hauek elkartuko dira.",
 "Import" => "Importatu",
-"Importing calendar" => "Egutegia inportatzen",
-"Calendar imported successfully" => "Egutegia ongi inportatu da",
 "Close Dialog" => "Itxi lehioa",
 "Create a new event" => "Sortu gertaera berria",
 "View an event" => "Ikusi gertaera bat",
 "No categories selected" => "Ez da kategoriarik hautatu",
-"Select category" => "Aukeratu kategoria",
 "Timezone" => "Ordu-zonaldea",
-"Check always for changes of the timezone" => "Egiaztatu beti ordu-zonalde aldaketen bila",
-"Timeformat" => "Ordu formatua",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Asteko lehenego eguna",
-"Calendar CalDAV syncing address:" => "Egutegiaren CalDAV sinkronizazio helbidea",
+"Cache" => "Cache",
+"Clear cache for repeating events" => "Ezabatu gertaera errepikakorren cachea",
+"Calendar CalDAV syncing addresses" => "Egutegiaren CalDAV sinkronizazio helbideak",
+"more info" => "informazio gehiago",
+"Primary address (Kontact et al)" => "Helbide nagusia",
+"iOS/OS X" => "iOS/OS X",
 "Users" => "Erabiltzaileak",
 "select users" => "hautatutako erabiltzaileak",
 "Editable" => "Editagarria",
diff --git a/apps/calendar/l10n/fa.php b/apps/calendar/l10n/fa.php
index cd2bb9c2e5a..9235460834b 100644
--- a/apps/calendar/l10n/fa.php
+++ b/apps/calendar/l10n/fa.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "زمان محلی تغییر یافت",
 "Invalid request" => "درخواست نامعتبر",
 "Calendar" => "تقویم",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "DDD m[ yyyy]{ '&#8212;'[ DDD] m yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "روزتولد",
 "Business" => "تجارت",
 "Call" => "تماس گرفتن",
@@ -23,6 +28,7 @@
 "Questions" => "سوالات",
 "Work" => "کار",
 "unnamed" => "نام گذاری نشده",
+"New Calendar" => "تقویم جدید",
 "Does not repeat" => "تکرار نکنید",
 "Daily" => "روزانه",
 "Weekly" => "هفتهگی",
@@ -68,7 +74,6 @@
 "Date" => "تاریخ",
 "Cal." => "تقویم.",
 "All day" => "هرروز",
-"New Calendar" => "تقویم جدید",
 "Missing fields" => "فیلد های گم شده",
 "Title" => "عنوان",
 "From Date" => "از تاریخ",
@@ -81,9 +86,6 @@
 "Month" => "ماه",
 "List" => "فهرست",
 "Today" => "امروز",
-"Calendars" => "تقویم ها",
-"There was a fail, while parsing the file." => "ناتوان در تجزیه پرونده",
-"Choose active calendars" => "تقویم فعال را انتخاب کنید",
 "Your calendars" => "تقویم های شما",
 "CalDav Link" => "CalDav Link",
 "Shared calendars" => "تقویمهای به اشترک گذاری شده",
@@ -132,27 +134,19 @@
 "Interval" => "فاصله",
 "End" => "پایان",
 "occurrences" => "ظهور",
-"Import a calendar file" => "یک پرونده حاوی تقویم وارد کنید",
-"Please choose the calendar" => "لطفا تقویم را انتخاب کنید",
 "create a new calendar" => "یک تقویم جدید ایجاد کنید",
+"Import a calendar file" => "یک پرونده حاوی تقویم وارد کنید",
 "Name of new calendar" => "نام تقویم جدید",
 "Import" => "ورودی دادن",
-"Importing calendar" => "درحال افزودن تقویم",
-"Calendar imported successfully" => "افزودن تقویم موفقیت آمیز بود",
 "Close Dialog" => "بستن دیالوگ",
 "Create a new event" => "یک رویداد ایجاد کنید",
 "View an event" => "دیدن یک رویداد",
 "No categories selected" => "هیچ گروهی انتخاب نشده",
-"Select category" => "انتخاب گروه",
 "of" => "از",
 "at" => "در",
 "Timezone" => "زمان محلی",
-"Check always for changes of the timezone" => "همیشه بررسی کنید برای تغییر زمان محلی",
-"Timeformat" => "نوع زمان",
 "24h" => "24 ساعت",
 "12h" => "12 ساعت",
-"First day of the week" => "یکمین روز هفته",
-"Calendar CalDAV syncing address:" => "Calendar CalDAV syncing address :",
 "Users" => "کاربرها",
 "select users" => "انتخاب شناسه ها",
 "Editable" => "قابل ویرایش",
diff --git a/apps/calendar/l10n/fi_FI.php b/apps/calendar/l10n/fi_FI.php
index 23096d7365a..1faa161e658 100644
--- a/apps/calendar/l10n/fi_FI.php
+++ b/apps/calendar/l10n/fi_FI.php
@@ -87,9 +87,6 @@
 "Month" => "Kuukausi",
 "List" => "Lista",
 "Today" => "Tänään",
-"Calendars" => "Kalenterit",
-"There was a fail, while parsing the file." => "Tiedostoa jäsennettäessä tapahtui virhe.",
-"Choose active calendars" => "Valitse aktiiviset kalenterit",
 "Your calendars" => "Omat kalenterisi",
 "CalDav Link" => "CalDav-linkki",
 "Shared calendars" => "Jaetut kalenterit",
@@ -143,11 +140,8 @@
 "View an event" => "Avaa tapahtuma",
 "No categories selected" => "Luokkia ei ole valittu",
 "Timezone" => "Aikavyöhyke",
-"Check always for changes of the timezone" => "Tarkista aina aikavyöhykkeen muutokset",
-"Timeformat" => "Ajan esitysmuoto",
 "24h" => "24 tuntia",
 "12h" => "12 tuntia",
-"First day of the week" => "Viikon ensimmäinen päivä",
 "Calendar CalDAV syncing addresses" => "Kalenterin CalDAV-synkronointiosoitteet",
 "iOS/OS X" => "iOS/OS X",
 "Users" => "Käyttäjät",
diff --git a/apps/calendar/l10n/fr.php b/apps/calendar/l10n/fr.php
index c43b16631e4..90ba903b876 100644
--- a/apps/calendar/l10n/fr.php
+++ b/apps/calendar/l10n/fr.php
@@ -112,9 +112,6 @@
 "Month" => "Mois",
 "List" => "Liste",
 "Today" => "Aujourd'hui",
-"Calendars" => "Calendriers",
-"There was a fail, while parsing the file." => "Une erreur est survenue pendant la lecture du fichier.",
-"Choose active calendars" => "Choix des calendriers actifs",
 "Your calendars" => "Vos calendriers",
 "CalDav Link" => "Lien CalDav",
 "Shared calendars" => "Calendriers partagés",
@@ -177,11 +174,8 @@
 "of" => "de",
 "at" => "à",
 "Timezone" => "Fuseau horaire",
-"Check always for changes of the timezone" => "Toujours vérifier d'éventuels changements de fuseau horaire",
-"Timeformat" => "Format de l'heure",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Premier jour de la semaine",
 "Cache" => "Cache",
 "Clear cache for repeating events" => "Nettoyer le cache des événements répétitifs",
 "Calendar CalDAV syncing addresses" => "Adresses de synchronisation des calendriers CalDAV",
diff --git a/apps/calendar/l10n/gl.php b/apps/calendar/l10n/gl.php
index 3178b1819ec..ff7e4833ad1 100644
--- a/apps/calendar/l10n/gl.php
+++ b/apps/calendar/l10n/gl.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Fuso horario trocado",
 "Invalid request" => "Petición non válida",
 "Calendar" => "Calendario",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d MMM[ yyyy]{ '&#8212;'d [ MMM] yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d,yyyy",
 "Birthday" => "Aniversario",
 "Business" => "Traballo",
 "Call" => "Chamada",
@@ -23,6 +28,7 @@
 "Questions" => "Preguntas",
 "Work" => "Traballo",
 "unnamed" => "sen nome",
+"New Calendar" => "Novo calendario",
 "Does not repeat" => "Non se repite",
 "Daily" => "A diario",
 "Weekly" => "Semanalmente",
@@ -68,7 +74,6 @@
 "Date" => "Data",
 "Cal." => "Cal.",
 "All day" => "Todo o dia",
-"New Calendar" => "Novo calendario",
 "Missing fields" => "Faltan campos",
 "Title" => "Título",
 "From Date" => "Desde a data",
@@ -81,9 +86,6 @@
 "Month" => "Mes",
 "List" => "Lista",
 "Today" => "Hoxe",
-"Calendars" => "Calendarios",
-"There was a fail, while parsing the file." => "Produciuse un erro ao procesar o ficheiro",
-"Choose active calendars" => "Escolla os calendarios activos",
 "Your calendars" => "Os seus calendarios",
 "CalDav Link" => "Ligazón CalDav",
 "Shared calendars" => "Calendarios compartidos",
@@ -132,27 +134,19 @@
 "Interval" => "Intervalo",
 "End" => "Fin",
 "occurrences" => "acontecementos",
-"Import a calendar file" => "Importar un ficheiro de calendario",
-"Please choose the calendar" => "Por favor, seleccione o calendario",
 "create a new calendar" => "crear un novo calendario",
+"Import a calendar file" => "Importar un ficheiro de calendario",
 "Name of new calendar" => "Nome do novo calendario",
 "Import" => "Importar",
-"Importing calendar" => "Importar calendario",
-"Calendar imported successfully" => "Calendario importado correctamente",
 "Close Dialog" => "Pechar diálogo",
 "Create a new event" => "Crear un novo evento",
 "View an event" => "Ver un evento",
 "No categories selected" => "Non seleccionou as categorías",
-"Select category" => "Seleccionar categoría",
 "of" => "de",
 "at" => "a",
 "Timezone" => "Fuso horario",
-"Check always for changes of the timezone" => "Comprobar sempre cambios de fuso horario",
-"Timeformat" => "Formato de hora",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Primeiro día da semana",
-"Calendar CalDAV syncing address:" => "Enderezo de sincronización do calendario CalDAV:",
 "Users" => "Usuarios",
 "select users" => "escoller usuarios",
 "Editable" => "Editable",
diff --git a/apps/calendar/l10n/he.php b/apps/calendar/l10n/he.php
index c161d3be2ef..d5c0b2b2e53 100644
--- a/apps/calendar/l10n/he.php
+++ b/apps/calendar/l10n/he.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "אזור זמן השתנה",
 "Invalid request" => "בקשה לא חוקית",
 "Calendar" => "ח שנה",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d MMM [ yyyy]{ '&#8212;'d[ MMM] yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "יום הולדת",
 "Business" => "עסקים",
 "Call" => "שיחה",
@@ -23,6 +28,7 @@
 "Questions" => "שאלות",
 "Work" => "עבודה",
 "unnamed" => "ללא שם",
+"New Calendar" => "לוח שנה חדש",
 "Does not repeat" => "ללא חזרה",
 "Daily" => "יומי",
 "Weekly" => "שבועי",
@@ -68,7 +74,6 @@
 "Date" => "תאריך",
 "Cal." => "לוח שנה",
 "All day" => "היום",
-"New Calendar" => "לוח שנה חדש",
 "Missing fields" => "שדות חסרים",
 "Title" => "כותרת",
 "From Date" => "מתאריך",
@@ -81,9 +86,6 @@
 "Month" => "חודש",
 "List" => "רשימה",
 "Today" => "היום",
-"Calendars" => "לוחות שנה",
-"There was a fail, while parsing the file." => "אירעה שגיאה בעת פענוח הקובץ.",
-"Choose active calendars" => "בחר לוחות שנה פעילים",
 "Your calendars" => "לוחות השנה שלך",
 "CalDav Link" => "קישור CalDav",
 "Shared calendars" => "לוחות שנה מושתפים",
@@ -132,27 +134,19 @@
 "Interval" => "משך",
 "End" => "סיום",
 "occurrences" => "מופעים",
-"Import a calendar file" => "יבוא קובץ לוח שנה",
-"Please choose the calendar" => "נא לבחור את לוח השנה",
 "create a new calendar" => "יצירת לוח שנה חדש",
+"Import a calendar file" => "יבוא קובץ לוח שנה",
 "Name of new calendar" => "שם לוח השנה החדש",
 "Import" => "יבוא",
-"Importing calendar" => "היומן מייובא",
-"Calendar imported successfully" => "היומן ייובא בהצלחה",
 "Close Dialog" => "סגירת הדו־שיח",
 "Create a new event" => "יצירת אירוע חדש",
 "View an event" => "צפייה באירוע",
 "No categories selected" => "לא נבחרו קטגוריות",
-"Select category" => "בחר קטגוריה",
 "of" => "מתוך",
 "at" => "בשנה",
 "Timezone" => "אזור זמן",
-"Check always for changes of the timezone" => "יש לבדוק תמיד אם יש הבדלים באזורי הזמן",
-"Timeformat" => "מבנה התאריך",
 "24h" => "24 שעות",
 "12h" => "12 שעות",
-"First day of the week" => "היום הראשון בשבוע",
-"Calendar CalDAV syncing address:" => "כתובת הסנכרון ללוח שנה מסוג CalDAV:",
 "Users" => "משתמשים",
 "select users" => "נא לבחור במשתמשים",
 "Editable" => "ניתן לעריכה",
diff --git a/apps/calendar/l10n/hr.php b/apps/calendar/l10n/hr.php
index 551bb4abbcb..4ab5b955186 100644
--- a/apps/calendar/l10n/hr.php
+++ b/apps/calendar/l10n/hr.php
@@ -23,6 +23,7 @@
 "Questions" => "Pitanja",
 "Work" => "Posao",
 "unnamed" => "bezimeno",
+"New Calendar" => "Novi kalendar",
 "Does not repeat" => "Ne ponavlja se",
 "Daily" => "Dnevno",
 "Weekly" => "Tjedno",
@@ -67,7 +68,6 @@
 "Date" => "datum",
 "Cal." => "Kal.",
 "All day" => "Cijeli dan",
-"New Calendar" => "Novi kalendar",
 "Missing fields" => "Nedostaju polja",
 "Title" => "Naslov",
 "From Date" => "Datum od",
@@ -80,9 +80,6 @@
 "Month" => "Mjesec",
 "List" => "Lista",
 "Today" => "Danas",
-"Calendars" => "Kalendari",
-"There was a fail, while parsing the file." => "Pogreška pri čitanju datoteke.",
-"Choose active calendars" => "Odabir aktivnih kalendara",
 "Your calendars" => "Vaši kalendari",
 "CalDav Link" => "CalDav poveznica",
 "Shared calendars" => "Podijeljeni kalendari",
@@ -128,27 +125,19 @@
 "Interval" => "Interval",
 "End" => "Kraj",
 "occurrences" => "pojave",
-"Import a calendar file" => "Uvozite datoteku kalendara",
-"Please choose the calendar" => "Odaberi kalendar",
 "create a new calendar" => "stvori novi kalendar",
+"Import a calendar file" => "Uvozite datoteku kalendara",
 "Name of new calendar" => "Ime novog kalendara",
 "Import" => "Uvoz",
-"Importing calendar" => "Uvoz kalendara",
-"Calendar imported successfully" => "Kalendar je uspješno uvezen",
 "Close Dialog" => "Zatvori dijalog",
 "Create a new event" => "Unesi novi događaj",
 "View an event" => "Vidjeti događaj",
 "No categories selected" => "Nema odabranih kategorija",
-"Select category" => "Odabir kategorije",
 "of" => "od",
 "at" => "na",
 "Timezone" => "Vremenska zona",
-"Check always for changes of the timezone" => "Provjerite uvijek za promjene vremenske zone",
-"Timeformat" => "Format vremena",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Prvi dan tjedna",
-"Calendar CalDAV syncing address:" => "Adresa za CalDAV sinkronizaciju kalendara:",
 "Users" => "Korisnici",
 "select users" => "odaberi korisnike",
 "Editable" => "Može se uređivati",
diff --git a/apps/calendar/l10n/hu_HU.php b/apps/calendar/l10n/hu_HU.php
index d97887aac7a..3ef4b9675be 100644
--- a/apps/calendar/l10n/hu_HU.php
+++ b/apps/calendar/l10n/hu_HU.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Időzóna megváltozott",
 "Invalid request" => "Érvénytelen kérés",
 "Calendar" => "Naptár",
+"ddd" => "nnn",
+"ddd M/d" => "nnn H/n",
+"dddd M/d" => "nnnn H/n",
+"MMMM yyyy" => "HHHH éééé",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "nnnn, HHH n, éééé",
 "Birthday" => "Születésap",
 "Business" => "Üzlet",
 "Call" => "Hívás",
@@ -23,6 +28,7 @@
 "Questions" => "Kérdések",
 "Work" => "Munka",
 "unnamed" => "névtelen",
+"New Calendar" => "Új naptár",
 "Does not repeat" => "Nem ismétlődik",
 "Daily" => "Napi",
 "Weekly" => "Heti",
@@ -68,7 +74,6 @@
 "Date" => "Dátum",
 "Cal." => "Naptár",
 "All day" => "Egész nap",
-"New Calendar" => "Új naptár",
 "Missing fields" => "Hiányzó mezők",
 "Title" => "Cím",
 "From Date" => "Napjától",
@@ -81,9 +86,6 @@
 "Month" => "Hónap",
 "List" => "Lista",
 "Today" => "Ma",
-"Calendars" => "Naptárak",
-"There was a fail, while parsing the file." => "Probléma volt a fájl elemzése közben.",
-"Choose active calendars" => "Aktív naptár kiválasztása",
 "Your calendars" => "Naptárjaid",
 "CalDav Link" => "CalDAV link",
 "Shared calendars" => "Megosztott naptárak",
@@ -132,27 +134,19 @@
 "Interval" => "Időköz",
 "End" => "Vége",
 "occurrences" => "előfordulások",
-"Import a calendar file" => "Naptár-fájl importálása",
-"Please choose the calendar" => "Válassz naptárat",
 "create a new calendar" => "új naptár létrehozása",
+"Import a calendar file" => "Naptár-fájl importálása",
 "Name of new calendar" => "Új naptár neve",
 "Import" => "Importálás",
-"Importing calendar" => "Naptár importálása",
-"Calendar imported successfully" => "Naptár sikeresen importálva",
 "Close Dialog" => "Párbeszédablak bezárása",
 "Create a new event" => "Új esemény létrehozása",
 "View an event" => "Esemény megtekintése",
 "No categories selected" => "Nincs kiválasztott kategória",
-"Select category" => "Kategória kiválasztása",
 "of" => ", tulaj ",
 "at" => ", ",
 "Timezone" => "Időzóna",
-"Check always for changes of the timezone" => "Mindig ellenőrizze az időzóna-változásokat",
-"Timeformat" => "Időformátum",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "A hét első napja",
-"Calendar CalDAV syncing address:" => "Naptár CalDAV szinkronizálási cím:",
 "Users" => "Felhasználók",
 "select users" => "válassz felhasználókat",
 "Editable" => "Szerkeszthető",
diff --git a/apps/calendar/l10n/ia.php b/apps/calendar/l10n/ia.php
index a346e4de5b7..84c36536b95 100644
--- a/apps/calendar/l10n/ia.php
+++ b/apps/calendar/l10n/ia.php
@@ -16,6 +16,7 @@
 "Questions" => "Demandas",
 "Work" => "Travalio",
 "unnamed" => "sin nomine",
+"New Calendar" => "Nove calendario",
 "Does not repeat" => "Non repite",
 "Daily" => "Quotidian",
 "Weekly" => "Septimanal",
@@ -51,7 +52,6 @@
 "by day and month" => "per dia e mense",
 "Date" => "Data",
 "All day" => "Omne die",
-"New Calendar" => "Nove calendario",
 "Missing fields" => "Campos incomplete",
 "Title" => "Titulo",
 "From Date" => "Data de initio",
@@ -62,8 +62,6 @@
 "Month" => "Mense",
 "List" => "Lista",
 "Today" => "Hodie",
-"Calendars" => "Calendarios",
-"Choose active calendars" => "Selectionar calendarios active",
 "Your calendars" => "Tu calendarios",
 "Download" => "Discarga",
 "Edit" => "Modificar",
@@ -96,20 +94,17 @@
 "Select weeks" => "Seliger septimanas",
 "Interval" => "Intervallo",
 "End" => "Fin",
-"Import a calendar file" => "Importar un file de calendario",
-"Please choose the calendar" => "Selige el calendario",
 "create a new calendar" => "crear un nove calendario",
+"Import a calendar file" => "Importar un file de calendario",
 "Name of new calendar" => "Nomine del calendario",
 "Import" => "Importar",
 "Close Dialog" => "Clauder dialogo",
 "Create a new event" => "Crear un nove evento",
 "View an event" => "Vide un evento",
 "No categories selected" => "Nulle categorias seligite",
-"Select category" => "Selectionar categoria",
 "of" => "de",
 "at" => "in",
 "Timezone" => "Fuso horari",
-"First day of the week" => "Prime die del septimana",
 "Users" => "Usatores",
 "Groups" => "Gruppos"
 );
diff --git a/apps/calendar/l10n/id.php b/apps/calendar/l10n/id.php
index ac0734abba4..865c2118fac 100644
--- a/apps/calendar/l10n/id.php
+++ b/apps/calendar/l10n/id.php
@@ -14,9 +14,6 @@
 "Week" => "Minggu",
 "Month" => "Bulan",
 "Today" => "Hari ini",
-"Calendars" => "Kalender",
-"There was a fail, while parsing the file." => "Terjadi kesalahan, saat mengurai berkas.",
-"Choose active calendars" => "Pilih kalender aktif",
 "Download" => "Unduh",
 "Edit" => "Sunting",
 "Edit calendar" => "Sunting kalender",
diff --git a/apps/calendar/l10n/it.php b/apps/calendar/l10n/it.php
index 68f3e89dae1..04e10b582bf 100644
--- a/apps/calendar/l10n/it.php
+++ b/apps/calendar/l10n/it.php
@@ -112,9 +112,7 @@
 "Month" => "Mese",
 "List" => "Elenco",
 "Today" => "Oggi",
-"Calendars" => "Calendari",
-"There was a fail, while parsing the file." => "Si è verificato un errore durante l'analisi del file.",
-"Choose active calendars" => "Scegli i calendari attivi",
+"Settings" => "Impostazioni",
 "Your calendars" => "I tuoi calendari",
 "CalDav Link" => "Collegamento CalDav",
 "Shared calendars" => "Calendari condivisi",
@@ -176,14 +174,16 @@
 "No categories selected" => "Nessuna categoria selezionata",
 "of" => "di",
 "at" => "alle",
+"General" => "Generale",
 "Timezone" => "Fuso orario",
-"Check always for changes of the timezone" => "Controlla sempre i cambiamenti di fuso orario",
-"Timeformat" => "Formato orario",
+"Update timezone automatically" => "Aggiorna automaticamente il fuso orario",
+"Time format" => "Formato orario",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Primo giorno della settimana",
+"Start week on" => "La settimana inizia il",
 "Cache" => "Cache",
 "Clear cache for repeating events" => "Cancella gli eventi che si ripetono dalla cache",
+"URLs" => "URL",
 "Calendar CalDAV syncing addresses" => "Indirizzi di sincronizzazione calendari CalDAV",
 "more info" => "ulteriori informazioni",
 "Primary address (Kontact et al)" => "Indirizzo principale (Kontact e altri)",
diff --git a/apps/calendar/l10n/ja_JP.php b/apps/calendar/l10n/ja_JP.php
index c533a9bd1a7..f49aef73d5a 100644
--- a/apps/calendar/l10n/ja_JP.php
+++ b/apps/calendar/l10n/ja_JP.php
@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "すべてのカレンダーは完全にキャッシュされていません",
+"Everything seems to be completely cached" => "すべて完全にキャッシュされていると思われます",
 "No calendars found." => "カレンダーが見つかりませんでした。",
 "No events found." => "イベントが見つかりませんでした。",
 "Wrong calendar" => "誤ったカレンダーです",
+"The file contained either no events or all events are already saved in your calendar." => "イベントの無いもしくはすべてのイベントを含むファイルは既にあなたのカレンダーに保存されています。",
+"events has been saved in the new calendar" => "イベントは新しいカレンダーに保存されました",
+"Import failed" => "インポートに失敗",
+"events has been saved in your calendar" => "イベントはあなたのカレンダーに保存されました",
 "New Timezone:" => "新しいタイムゾーン:",
 "Timezone changed" => "タイムゾーンが変更されました",
 "Invalid request" => "無効なリクエストです",
 "Calendar" => "カレンダー",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"ddd" => "dddd",
+"ddd M/d" => "M月d日 （dddd）",
+"dddd M/d" => "M月d日 （dddd）",
+"MMMM yyyy" => "yyyy年M月",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "yyyy年M月d日{ '～' [yyyy年][M月]d日}",
+"dddd, MMM d, yyyy" => "yyyy年M月d日 （dddd）",
 "Birthday" => "誕生日",
 "Business" => "ビジネス",
 "Call" => "電話をかける",
@@ -22,6 +33,8 @@
 "Projects" => "プロジェクト",
 "Questions" => "質問事項",
 "Work" => "週の始まり",
+"unnamed" => "無名",
+"New Calendar" => "新しくカレンダーを作成",
 "Does not repeat" => "繰り返さない",
 "Daily" => "毎日",
 "Weekly" => "毎週",
@@ -34,13 +47,13 @@
 "by date" => "日付で指定",
 "by monthday" => "日にちで指定",
 "by weekday" => "曜日で指定",
-"Monday" => "月曜",
-"Tuesday" => "火曜",
-"Wednesday" => "水曜",
-"Thursday" => "木曜",
-"Friday" => "金曜",
-"Saturday" => "土曜",
-"Sunday" => "日曜",
+"Monday" => "月",
+"Tuesday" => "火",
+"Wednesday" => "水",
+"Thursday" => "木",
+"Friday" => "金",
+"Saturday" => "土",
+"Sunday" => "日",
 "events week of month" => "予定のある週を指定",
 "first" => "１週目",
 "second" => "２週目",
@@ -48,26 +61,44 @@
 "fourth" => "４週目",
 "fifth" => "５週目",
 "last" => "最終週",
-"January" => "１月",
-"February" => "２月",
-"March" => "３月",
-"April" => "４月",
-"May" => "５月",
-"June" => "６月",
-"July" => "７月",
-"August" => "８月",
-"September" => "９月",
-"October" => "１０月",
-"November" => "１１月",
-"December" => "１２月",
+"January" => "1月",
+"February" => "2月",
+"March" => "3月",
+"April" => "4月",
+"May" => "5月",
+"June" => "6月",
+"July" => "7月",
+"August" => "8月",
+"September" => "9月",
+"October" => "10月",
+"November" => "11月",
+"December" => "12月",
 "by events date" => "日付で指定",
 "by yearday(s)" => "日番号で指定",
 "by weeknumber(s)" => "週番号で指定",
 "by day and month" => "月と日で指定",
 "Date" => "日付",
 "Cal." => "カレンダー",
+"Sun." => "日",
+"Mon." => "月",
+"Tue." => "火",
+"Wed." => "水",
+"Thu." => "木",
+"Fri." => "金",
+"Sat." => "土",
+"Jan." => "1月",
+"Feb." => "2月",
+"Mar." => "3月",
+"Apr." => "4月",
+"May." => "5月",
+"Jun." => "6月",
+"Jul." => "7月",
+"Aug." => "8月",
+"Sep." => "9月",
+"Oct." => "10月",
+"Nov." => "11月",
+"Dec." => "12月",
 "All day" => "終日",
-"New Calendar" => "新しくカレンダーを作成",
 "Missing fields" => "項目がありません",
 "Title" => "タイトル",
 "From Date" => "開始日",
@@ -80,9 +111,6 @@
 "Month" => "月",
 "List" => "リスト",
 "Today" => "今日",
-"Calendars" => "カレンダー",
-"There was a fail, while parsing the file." => "ファイルの構文解析に失敗しました。",
-"Choose active calendars" => "アクティブなカレンダーを選択",
 "Your calendars" => "あなたのカレンダー",
 "CalDav Link" => "CalDavへのリンク",
 "Shared calendars" => "共有カレンダー",
@@ -91,6 +119,7 @@
 "Download" => "ダウンロード",
 "Edit" => "編集",
 "Delete" => "削除",
+"shared with you by" => "共有者",
 "New calendar" => "新しいカレンダー",
 "Edit calendar" => "カレンダーを編集",
 "Displayname" => "表示名",
@@ -130,27 +159,29 @@
 "Interval" => "間隔",
 "End" => "繰り返す期間",
 "occurrences" => "回繰り返す",
-"Import a calendar file" => "カレンダーファイルをインポート",
-"Please choose the calendar" => "カレンダーを選択してください",
 "create a new calendar" => "新規カレンダーの作成",
+"Import a calendar file" => "カレンダーファイルをインポート",
+"Please choose a calendar" => "カレンダーを選択してください",
 "Name of new calendar" => "新規カレンダーの名称",
+"Take an available name!" => "利用可能な名前を指定してください！",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "このカレンダー名はすでに使われています。もし続行する場合は、これらのカレンダーはマージされます。",
 "Import" => "インポート",
-"Importing calendar" => "カレンダーを取り込み中",
-"Calendar imported successfully" => "カレンダーの取り込みに成功しました",
 "Close Dialog" => "ダイアログを閉じる",
 "Create a new event" => "新しいイベントを作成",
 "View an event" => "イベントを閲覧",
 "No categories selected" => "カテゴリが選択されていません",
-"Select category" => "カテゴリーを選択してください",
 "of" => "of",
 "at" => "at",
 "Timezone" => "タイムゾーン",
-"Check always for changes of the timezone" => "タイムゾーンの変更を常に確認",
-"Timeformat" => "時刻のフォーマット",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "週の始まり",
-"Calendar CalDAV syncing address:" => "CalDAVカレンダーの同期アドレス:",
+"Cache" => "キャッシュ",
+"Clear cache for repeating events" => "イベントを繰り返すためにキャッシュをクリアしてください",
+"Calendar CalDAV syncing addresses" => "CalDAVカレンダーの同期用アドレス",
+"more info" => "さらに",
+"Primary address (Kontact et al)" => "プライマリアドレス（コンタクト等）",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "読み取り専用のiCalendarリンク",
 "Users" => "ユーザ",
 "select users" => "ユーザを選択",
 "Editable" => "編集可能",
diff --git a/apps/calendar/l10n/ko.php b/apps/calendar/l10n/ko.php
index 181bfa4378f..77e421d4aab 100644
--- a/apps/calendar/l10n/ko.php
+++ b/apps/calendar/l10n/ko.php
@@ -6,6 +6,12 @@
 "Timezone changed" => "시간대 변경됨",
 "Invalid request" => "잘못된 요청",
 "Calendar" => "달력",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "생일",
 "Business" => "사업",
 "Call" => "통화",
@@ -22,6 +28,7 @@
 "Questions" => "질문",
 "Work" => "작업",
 "unnamed" => "익명의",
+"New Calendar" => "새로운 달력",
 "Does not repeat" => "반복 없음",
 "Daily" => "매일",
 "Weekly" => "매주",
@@ -67,7 +74,6 @@
 "Date" => "날짜",
 "Cal." => "달력",
 "All day" => "매일",
-"New Calendar" => "새로운 달력",
 "Missing fields" => "기입란이 비어있습니다",
 "Title" => "제목",
 "From Date" => "시작날짜",
@@ -80,9 +86,6 @@
 "Month" => "달",
 "List" => "목록",
 "Today" => "오늘",
-"Calendars" => "달력",
-"There was a fail, while parsing the file." => "파일을 처리하는 중 오류가 발생하였습니다.",
-"Choose active calendars" => "활성 달력 선택",
 "Your calendars" => "내 달력",
 "CalDav Link" => "CalDav 링크",
 "Shared calendars" => "공유 달력",
@@ -131,27 +134,19 @@
 "Interval" => "간격",
 "End" => "끝",
 "occurrences" => "번 이후",
-"Import a calendar file" => "달력 파일 가져오기",
-"Please choose the calendar" => "달력을 선택해 주세요",
 "create a new calendar" => "새 달력 만들기",
+"Import a calendar file" => "달력 파일 가져오기",
 "Name of new calendar" => "새 달력 이름",
 "Import" => "입력",
-"Importing calendar" => "달력 입력",
-"Calendar imported successfully" => "달력 입력을 성공적으로 마쳤습니다.",
 "Close Dialog" => "대화 마침",
 "Create a new event" => "새 이벤트 만들기",
 "View an event" => "일정 보기",
 "No categories selected" => "선택된 카테고리 없음",
-"Select category" => "선택 카테고리",
 "of" => "의",
 "at" => "에서",
 "Timezone" => "시간대",
-"Check always for changes of the timezone" => "항상 시간대 변경 확인하기",
-"Timeformat" => "시간 형식 설정",
 "24h" => "24시간",
 "12h" => "12시간",
-"First day of the week" => "그 주의 첫째날",
-"Calendar CalDAV syncing address:" => "달력 CalDav 동기화 주소",
 "Users" => "사용자",
 "select users" => "사용자 선택",
 "Editable" => "편집 가능",
diff --git a/apps/calendar/l10n/lb.php b/apps/calendar/l10n/lb.php
index b40f652cc50..1ef05b048c0 100644
--- a/apps/calendar/l10n/lb.php
+++ b/apps/calendar/l10n/lb.php
@@ -22,6 +22,7 @@
 "Projects" => "Projeten",
 "Questions" => "Froen",
 "Work" => "Aarbecht",
+"New Calendar" => "Neien Kalenner",
 "Does not repeat" => "Widderhëlt sech net",
 "Daily" => "Deeglech",
 "Weekly" => "All Woch",
@@ -62,7 +63,6 @@
 "Date" => "Datum",
 "Cal." => "Cal.",
 "All day" => "All Dag",
-"New Calendar" => "Neien Kalenner",
 "Missing fields" => "Felder déi feelen",
 "Title" => "Titel",
 "From Date" => "Vun Datum",
@@ -75,9 +75,6 @@
 "Month" => "Mount",
 "List" => "Lescht",
 "Today" => "Haut",
-"Calendars" => "Kalenneren",
-"There was a fail, while parsing the file." => "Feeler beim lueden vum Fichier.",
-"Choose active calendars" => "Wiel aktiv Kalenneren aus",
 "Your calendars" => "Deng Kalenneren",
 "CalDav Link" => "CalDav Link",
 "Shared calendars" => "Gedeelte Kalenneren",
@@ -114,19 +111,13 @@
 "Interval" => "Intervall",
 "End" => "Enn",
 "occurrences" => "Virkommes",
-"Import a calendar file" => "E Kalenner Fichier importéieren",
-"Please choose the calendar" => "Wiel den Kalenner aus",
 "create a new calendar" => "E neie Kalenner uleeën",
+"Import a calendar file" => "E Kalenner Fichier importéieren",
 "Name of new calendar" => "Numm vum neie Kalenner",
 "Import" => "Import",
-"Importing calendar" => "Importéiert Kalenner",
-"Calendar imported successfully" => "Kalenner erfollegräich importéiert",
 "Close Dialog" => "Dialog zoumaachen",
 "Create a new event" => "En Evenement maachen",
-"Select category" => "Kategorie auswielen",
 "Timezone" => "Zäitzon",
-"Timeformat" => "Zäit Format",
 "24h" => "24h",
-"12h" => "12h",
-"Calendar CalDAV syncing address:" => "CalDAV Kalenner Synchronisatioun's Adress:"
+"12h" => "12h"
 );
diff --git a/apps/calendar/l10n/lt_LT.php b/apps/calendar/l10n/lt_LT.php
index d7e15fb438f..feb8618897c 100644
--- a/apps/calendar/l10n/lt_LT.php
+++ b/apps/calendar/l10n/lt_LT.php
@@ -23,6 +23,7 @@
 "Questions" => "Klausimai",
 "Work" => "Darbas",
 "unnamed" => "be pavadinimo",
+"New Calendar" => "Naujas kalendorius",
 "Does not repeat" => "Nekartoti",
 "Daily" => "Kasdien",
 "Weekly" => "Kiekvieną savaitę",
@@ -56,7 +57,6 @@
 "Date" => "Data",
 "Cal." => "Kal.",
 "All day" => "Visa diena",
-"New Calendar" => "Naujas kalendorius",
 "Missing fields" => "Trūkstami laukai",
 "Title" => "Pavadinimas",
 "From Date" => "Nuo datos",
@@ -69,9 +69,6 @@
 "Month" => "Mėnuo",
 "List" => "Sąrašas",
 "Today" => "Šiandien",
-"Calendars" => "Kalendoriai",
-"There was a fail, while parsing the file." => "Apdorojant failą įvyko klaida.",
-"Choose active calendars" => "Pasirinkite naudojamus kalendorius",
 "Your calendars" => "Jūsų kalendoriai",
 "CalDav Link" => "CalDav adresas",
 "Shared calendars" => "Bendri kalendoriai",
@@ -92,6 +89,7 @@
 "Export" => "Eksportuoti",
 "Eventinfo" => "Informacija",
 "Repeating" => "Pasikartojantis",
+"Alarm" => "Priminimas",
 "Attendees" => "Dalyviai",
 "Share" => "Dalintis",
 "Title of the Event" => "Įvykio pavadinimas",
@@ -113,24 +111,17 @@
 "Select weeks" => "Pasirinkite savaites",
 "Interval" => "Intervalas",
 "End" => "Pabaiga",
-"Import a calendar file" => "Importuoti kalendoriaus failą",
-"Please choose the calendar" => "Pasirinkite kalendorių",
 "create a new calendar" => "sukurti naują kalendorių",
+"Import a calendar file" => "Importuoti kalendoriaus failą",
 "Name of new calendar" => "Naujo kalendoriaus pavadinimas",
 "Import" => "Importuoti",
-"Importing calendar" => "Importuojamas kalendorius",
-"Calendar imported successfully" => "Kalendorius sėkmingai importuotas",
 "Close Dialog" => "Uždaryti",
 "Create a new event" => "Sukurti naują įvykį",
 "View an event" => "Peržiūrėti įvykį",
 "No categories selected" => "Nepasirinktos jokios katagorijos",
-"Select category" => "Pasirinkite kategoriją",
 "Timezone" => "Laiko juosta",
-"Check always for changes of the timezone" => "Visada tikrinti laiko zonos pasikeitimus",
-"Timeformat" => "Laiko formatas",
 "24h" => "24val",
 "12h" => "12val",
-"Calendar CalDAV syncing address:" => "CalDAV kalendoriaus synchronizavimo adresas:",
 "Users" => "Vartotojai",
 "select users" => "pasirinkti vartotojus",
 "Editable" => "Redaguojamas",
diff --git a/apps/calendar/l10n/mk.php b/apps/calendar/l10n/mk.php
index 41df376dfa6..1a03101fe51 100644
--- a/apps/calendar/l10n/mk.php
+++ b/apps/calendar/l10n/mk.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Временската зона е променета",
 "Invalid request" => "Неправилно барање",
 "Calendar" => "Календар",
+"ddd" => "ддд",
+"ddd M/d" => "ддд М/д",
+"dddd M/d" => "дддд М/д",
+"MMMM yyyy" => "ММММ гггг",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "дддд, МММ д, гггг",
 "Birthday" => "Роденден",
 "Business" => "Деловно",
 "Call" => "Повикај",
@@ -23,6 +28,7 @@
 "Questions" => "Прашања",
 "Work" => "Работа",
 "unnamed" => "неименувано",
+"New Calendar" => "Нов календар",
 "Does not repeat" => "Не се повторува",
 "Daily" => "Дневно",
 "Weekly" => "Седмично",
@@ -68,7 +74,6 @@
 "Date" => "Датум",
 "Cal." => "Кал.",
 "All day" => "Цел ден",
-"New Calendar" => "Нов календар",
 "Missing fields" => "Полиња кои недостасуваат",
 "Title" => "Наслов",
 "From Date" => "Од датум",
@@ -81,9 +86,6 @@
 "Month" => "Месец",
 "List" => "Листа",
 "Today" => "Денеска",
-"Calendars" => "Календари",
-"There was a fail, while parsing the file." => "Имаше проблем при парсирање на датотеката.",
-"Choose active calendars" => "Избери активни календари",
 "Your calendars" => "Ваши календари",
 "CalDav Link" => "Врска за CalDav",
 "Shared calendars" => "Споделени календари",
@@ -132,27 +134,19 @@
 "Interval" => "интервал",
 "End" => "Крај",
 "occurrences" => "повторувања",
-"Import a calendar file" => "Внеси календар од датотека ",
-"Please choose the calendar" => "Ве молам изберете го календарот",
 "create a new calendar" => "создади нов календар",
+"Import a calendar file" => "Внеси календар од датотека ",
 "Name of new calendar" => "Име на новиот календар",
 "Import" => "Увези",
-"Importing calendar" => "Увезување на календар",
-"Calendar imported successfully" => "Календарот беше успешно увезен",
 "Close Dialog" => "Затвори дијалог",
 "Create a new event" => "Создади нов настан",
 "View an event" => "Погледај настан",
 "No categories selected" => "Нема избрано категории",
-"Select category" => "Избери категорија",
 "of" => "од",
 "at" => "на",
 "Timezone" => "Временска зона",
-"Check always for changes of the timezone" => "Секогаш провери за промени на временската зона",
-"Timeformat" => "Формат на времето",
 "24h" => "24ч",
 "12h" => "12ч",
-"First day of the week" => "Прв ден од седмицата",
-"Calendar CalDAV syncing address:" => "CalDAV календар адресата за синхронизација:",
 "Users" => "Корисници",
 "select users" => "избери корисници",
 "Editable" => "Изменливо",
diff --git a/apps/calendar/l10n/ms_MY.php b/apps/calendar/l10n/ms_MY.php
index 2cb3ac41c30..4be91a40194 100644
--- a/apps/calendar/l10n/ms_MY.php
+++ b/apps/calendar/l10n/ms_MY.php
@@ -1,9 +1,17 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Tiada kalendar dijumpai.",
+"No events found." => "Tiada agenda dijumpai.",
 "Wrong calendar" => "Silap kalendar",
 "New Timezone:" => "Timezone Baru",
 "Timezone changed" => "Zon waktu diubah",
 "Invalid request" => "Permintaan tidak sah",
 "Calendar" => "Kalendar",
+"ddd" => "ddd",
+"ddd M/d" => "dd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyy",
 "Birthday" => "Hari lahir",
 "Business" => "Perniagaan",
 "Call" => "Panggilan",
@@ -19,6 +27,8 @@
 "Projects" => "Projek",
 "Questions" => "Soalan",
 "Work" => "Kerja",
+"unnamed" => "tiada nama",
+"New Calendar" => "Kalendar baru",
 "Does not repeat" => "Tidak berulang",
 "Daily" => "Harian",
 "Weekly" => "Mingguan",
@@ -64,7 +74,6 @@
 "Date" => "Tarikh",
 "Cal." => "Kalendar",
 "All day" => "Sepanjang hari",
-"New Calendar" => "Kalendar baru",
 "Missing fields" => "Ruangan tertinggal",
 "Title" => "Tajuk",
 "From Date" => "Dari tarikh",
@@ -77,13 +86,15 @@
 "Month" => "Bulan",
 "List" => "Senarai",
 "Today" => "Hari ini",
-"Calendars" => "Kalendar",
-"There was a fail, while parsing the file." => "Berlaku kegagalan ketika penguraian fail. ",
-"Choose active calendars" => "Pilih kalendar yang aktif",
+"Your calendars" => "Kalendar anda",
 "CalDav Link" => "Pautan CalDav",
+"Shared calendars" => "Kalendar Kongsian",
+"No shared calendars" => "Tiada kalendar kongsian",
+"Share Calendar" => "Kongsi Kalendar",
 "Download" => "Muat turun",
 "Edit" => "Edit",
 "Delete" => "Hapus",
+"shared with you by" => "dikongsi dengan kamu oleh",
 "New calendar" => "Kalendar baru",
 "Edit calendar" => "Edit kalendar",
 "Displayname" => "Paparan nama",
@@ -94,8 +105,15 @@
 "Cancel" => "Batal",
 "Edit an event" => "Edit agenda",
 "Export" => "Export",
+"Eventinfo" => "Maklumat agenda",
+"Repeating" => "Pengulangan",
+"Alarm" => "Penggera",
+"Attendees" => "Jemputan",
+"Share" => "Berkongsi",
 "Title of the Event" => "Tajuk agenda",
 "Category" => "kategori",
+"Separate categories with commas" => "Asingkan kategori dengan koma",
+"Edit categories" => "Sunting Kategori",
 "All Day Event" => "Agenda di sepanjang hari ",
 "From" => "Dari",
 "To" => "ke",
@@ -116,20 +134,23 @@
 "Interval" => "Tempoh",
 "End" => "Tamat",
 "occurrences" => "Peristiwa",
-"Import a calendar file" => "Import fail kalendar",
-"Please choose the calendar" => "Sila pilih kalendar",
 "create a new calendar" => "Cipta kalendar baru",
+"Import a calendar file" => "Import fail kalendar",
 "Name of new calendar" => "Nama kalendar baru",
 "Import" => "Import",
-"Importing calendar" => "Import kalendar",
-"Calendar imported successfully" => "Kalendar berjaya diimport",
 "Close Dialog" => "Tutup dialog",
 "Create a new event" => "Buat agenda baru",
-"Select category" => "Pilih kategori",
+"View an event" => "Papar peristiwa",
+"No categories selected" => "Tiada kategori dipilih",
+"of" => "dari",
+"at" => "di",
 "Timezone" => "Zon waktu",
-"Check always for changes of the timezone" => "Sentiasa mengemaskini perubahan zon masa",
-"Timeformat" => "Timeformat",
 "24h" => "24h",
 "12h" => "12h",
-"Calendar CalDAV syncing address:" => "Kelendar CalDAV mengemaskini alamat:"
+"Users" => "Pengguna",
+"select users" => "Pilih pengguna",
+"Editable" => "Boleh disunting",
+"Groups" => "Kumpulan-kumpulan",
+"select groups" => "pilih kumpulan-kumpulan",
+"make public" => "jadikan tontonan awam"
 );
diff --git a/apps/calendar/l10n/nb_NO.php b/apps/calendar/l10n/nb_NO.php
index 95ba5a9dba2..e4b859c7378 100644
--- a/apps/calendar/l10n/nb_NO.php
+++ b/apps/calendar/l10n/nb_NO.php
@@ -8,6 +8,7 @@
 "Calendar" => "Kalender",
 "Birthday" => "Bursdag",
 "Business" => "Forretninger",
+"Call" => "Ring",
 "Clients" => "Kunder",
 "Holidays" => "Ferie",
 "Ideas" => "Ideér",
@@ -20,6 +21,7 @@
 "Questions" => "Spørsmål",
 "Work" => "Arbeid",
 "unnamed" => "uten navn",
+"New Calendar" => "Ny kalender",
 "Does not repeat" => "Gjentas ikke",
 "Daily" => "Daglig",
 "Weekly" => "Ukentlig",
@@ -65,7 +67,6 @@
 "Date" => "Dato",
 "Cal." => "Kal.",
 "All day" => "Hele dagen ",
-"New Calendar" => "Ny kalender",
 "Missing fields" => "Manglende felt",
 "Title" => "Tittel",
 "From Date" => "Fra dato",
@@ -78,9 +79,6 @@
 "Month" => "ned",
 "List" => "Liste",
 "Today" => "I dag",
-"Calendars" => "Kalendre",
-"There was a fail, while parsing the file." => "Det oppstod en feil under åpningen av filen.",
-"Choose active calendars" => "Velg en aktiv kalender",
 "Your calendars" => "Dine kalendere",
 "CalDav Link" => "CalDav-lenke",
 "Shared calendars" => "Delte kalendere",
@@ -129,25 +127,17 @@
 "Interval" => "Intervall",
 "End" => "Slutt",
 "occurrences" => "forekomster",
-"Import a calendar file" => "Importer en kalenderfil",
-"Please choose the calendar" => "Vennligst velg kalenderen",
 "create a new calendar" => "Lag en ny kalender",
+"Import a calendar file" => "Importer en kalenderfil",
 "Name of new calendar" => "Navn på ny kalender:",
 "Import" => "Importer",
-"Importing calendar" => "Importerer kalender",
-"Calendar imported successfully" => "Kalenderen ble importert uten feil",
 "Close Dialog" => "Lukk dialog",
 "Create a new event" => "Opprett en ny hendelse",
 "View an event" => "Se på hendelse",
 "No categories selected" => "Ingen kategorier valgt",
-"Select category" => "Velg kategori",
 "Timezone" => "Tidssone",
-"Check always for changes of the timezone" => "Se alltid etter endringer i tidssone",
-"Timeformat" => "Tidsformat:",
 "24h" => "24 t",
 "12h" => "12 t",
-"First day of the week" => "Ukens første dag",
-"Calendar CalDAV syncing address:" => "Synkroniseringsadresse fo kalender CalDAV:",
 "Users" => "Brukere",
 "select users" => "valgte brukere",
 "Editable" => "Redigerbar",
diff --git a/apps/calendar/l10n/nl.php b/apps/calendar/l10n/nl.php
index d141a1cc08c..834c0ad9054 100644
--- a/apps/calendar/l10n/nl.php
+++ b/apps/calendar/l10n/nl.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Tijdzone is veranderd",
 "Invalid request" => "Ongeldige aanvraag",
 "Calendar" => "Kalender",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d MMM[ yyyy]{ '&#8212;' d[ MMM] yyyy}",
+"ddd" => "ddd",
+"ddd M/d" => "ddd d.M",
+"dddd M/d" => "dddd d.M",
+"MMMM yyyy" => "MMMM yyyy",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d[ MMM][ yyyy]{ '&#8212;' d MMM yyyy}",
+"dddd, MMM d, yyyy" => "dddd, d. MMM yyyy",
 "Birthday" => "Verjaardag",
 "Business" => "Zakelijk",
 "Call" => "Bellen",
@@ -23,6 +28,7 @@
 "Questions" => "Vragen",
 "Work" => "Werk",
 "unnamed" => "onbekend",
+"New Calendar" => "Nieuwe Kalender",
 "Does not repeat" => "Wordt niet herhaald",
 "Daily" => "Dagelijks",
 "Weekly" => "Wekelijks",
@@ -68,7 +74,6 @@
 "Date" => "Datum",
 "Cal." => "Cal.",
 "All day" => "Hele dag",
-"New Calendar" => "Nieuwe Kalender",
 "Missing fields" => "missende velden",
 "Title" => "Titel",
 "From Date" => "Begindatum",
@@ -81,9 +86,6 @@
 "Month" => "Maand",
 "List" => "Lijst",
 "Today" => "Vandaag",
-"Calendars" => "Kalenders",
-"There was a fail, while parsing the file." => "Er is een fout opgetreden bij het verwerken van het bestand.",
-"Choose active calendars" => "Kies actieve kalenders",
 "Your calendars" => "Je kalenders",
 "CalDav Link" => "CalDav Link",
 "Shared calendars" => "Gedeelde kalenders",
@@ -132,27 +134,19 @@
 "Interval" => "Interval",
 "End" => "Einde",
 "occurrences" => "gebeurtenissen",
-"Import a calendar file" => "Importeer een agenda bestand",
-"Please choose the calendar" => "Kies de kalender",
 "create a new calendar" => "Maak een nieuw agenda",
+"Import a calendar file" => "Importeer een agenda bestand",
 "Name of new calendar" => "Naam van de nieuwe agenda",
 "Import" => "Importeer",
-"Importing calendar" => "Importeer agenda",
-"Calendar imported successfully" => "Agenda succesvol geïmporteerd",
 "Close Dialog" => "Sluit venster",
 "Create a new event" => "Maak een nieuwe afspraak",
 "View an event" => "Bekijk een gebeurtenis",
 "No categories selected" => "Geen categorieën geselecteerd",
-"Select category" => "Kies een categorie",
 "of" => "van",
 "at" => "op",
 "Timezone" => "Tijdzone",
-"Check always for changes of the timezone" => "Controleer altijd op aanpassingen van de tijdszone",
-"Timeformat" => "Tijdformaat",
 "24h" => "24uur",
 "12h" => "12uur",
-"First day of the week" => "Eerste dag van de week",
-"Calendar CalDAV syncing address:" => "CalDAV kalender synchronisatie adres:",
 "Users" => "Gebruikers",
 "select users" => "kies gebruikers",
 "Editable" => "Te wijzigen",
diff --git a/apps/calendar/l10n/nn_NO.php b/apps/calendar/l10n/nn_NO.php
index 79119e8100b..3330cc562bc 100644
--- a/apps/calendar/l10n/nn_NO.php
+++ b/apps/calendar/l10n/nn_NO.php
@@ -19,6 +19,7 @@
 "Projects" => "Prosjekt",
 "Questions" => "Spørsmål",
 "Work" => "Arbeid",
+"New Calendar" => "Ny kalender",
 "Does not repeat" => "Ikkje gjenta",
 "Daily" => "Kvar dag",
 "Weekly" => "Kvar veke",
@@ -64,7 +65,6 @@
 "Date" => "Dato",
 "Cal." => "Kal.",
 "All day" => "Heile dagen",
-"New Calendar" => "Ny kalender",
 "Missing fields" => "Manglande felt",
 "Title" => "Tittel",
 "From Date" => "Frå dato",
@@ -77,9 +77,6 @@
 "Month" => "Månad",
 "List" => "Liste",
 "Today" => "I dag",
-"Calendars" => "Kalendarar",
-"There was a fail, while parsing the file." => "Feil ved tolking av fila.",
-"Choose active calendars" => "Vel aktive kalendarar",
 "CalDav Link" => "CalDav-lenkje",
 "Download" => "Last ned",
 "Edit" => "Endra",
@@ -116,20 +113,13 @@
 "Interval" => "Intervall",
 "End" => "Ende",
 "occurrences" => "førekomstar",
-"Import a calendar file" => "Importer ei kalenderfil",
-"Please choose the calendar" => "Venlegast vel kalenderen",
 "create a new calendar" => "Lag ny kalender",
+"Import a calendar file" => "Importer ei kalenderfil",
 "Name of new calendar" => "Namn for ny kalender",
 "Import" => "Importer",
-"Importing calendar" => "Importerar kalender",
-"Calendar imported successfully" => "Kalender importert utan feil",
 "Close Dialog" => "Steng dialog",
 "Create a new event" => "Opprett ei ny hending",
-"Select category" => "Vel kategori",
 "Timezone" => "Tidssone",
-"Check always for changes of the timezone" => "Sjekk alltid for endringar i tidssona",
-"Timeformat" => "Tidsformat",
 "24h" => "24t",
-"12h" => "12t",
-"Calendar CalDAV syncing address:" => "Kalender CalDAV synkroniseringsadresse:"
+"12h" => "12t"
 );
diff --git a/apps/calendar/l10n/pl.php b/apps/calendar/l10n/pl.php
index e582cdbb9b3..8fd1c3c2b4b 100644
--- a/apps/calendar/l10n/pl.php
+++ b/apps/calendar/l10n/pl.php
@@ -2,11 +2,18 @@
 "No calendars found." => "Brak kalendarzy",
 "No events found." => "Brak wydzarzeń",
 "Wrong calendar" => "Nieprawidłowy kalendarz",
+"Import failed" => "Import nieudany",
+"events has been saved in your calendar" => "zdarzenie zostało zapisane w twoim kalendarzu",
 "New Timezone:" => "Nowa strefa czasowa:",
 "Timezone changed" => "Zmieniono strefę czasową",
 "Invalid request" => "Nieprawidłowe żądanie",
 "Calendar" => "Kalendarz",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM rrrr",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, rrrr",
 "Birthday" => "Urodziny",
 "Business" => "Interesy",
 "Call" => "Rozmowy",
@@ -22,7 +29,9 @@
 "Projects" => "Projekty",
 "Questions" => "Pytania",
 "Work" => "Zawodowe",
+"by" => "przez",
 "unnamed" => "nienazwany",
+"New Calendar" => "Nowy kalendarz",
 "Does not repeat" => "Brak",
 "Daily" => "Codziennie",
 "Weekly" => "Tygodniowo",
@@ -67,8 +76,26 @@
 "by day and month" => "przez dzień i miesiąc",
 "Date" => "Data",
 "Cal." => "Kal.",
+"Sun." => "N.",
+"Mon." => "Pn.",
+"Tue." => "Wt.",
+"Wed." => "Śr.",
+"Thu." => "Cz.",
+"Fri." => "Pt.",
+"Sat." => "S.",
+"Jan." => "Sty.",
+"Feb." => "Lut.",
+"Mar." => "Mar.",
+"Apr." => "Kwi.",
+"May." => "Maj.",
+"Jun." => "Cze.",
+"Jul." => "Lip.",
+"Aug." => "Sie.",
+"Sep." => "Wrz.",
+"Oct." => "Paź.",
+"Nov." => "Lis.",
+"Dec." => "Gru.",
 "All day" => "Cały dzień",
-"New Calendar" => "Nowy kalendarz",
 "Missing fields" => "Brakujące pola",
 "Title" => "Nazwa",
 "From Date" => "Od daty",
@@ -81,9 +108,6 @@
 "Month" => "Miesiąc",
 "List" => "Lista",
 "Today" => "Dzisiaj",
-"Calendars" => "Kalendarze",
-"There was a fail, while parsing the file." => "Nie udało się przetworzyć pliku.",
-"Choose active calendars" => "Wybór aktywnych kalendarzy",
 "Your calendars" => "Twoje kalendarze",
 "CalDav Link" => "Wyświetla odnośnik CalDAV",
 "Shared calendars" => "Współdzielone kalendarze",
@@ -132,27 +156,23 @@
 "Interval" => "Interwał",
 "End" => "Koniec",
 "occurrences" => "wystąpienia",
-"Import a calendar file" => "Zaimportuj plik kalendarza",
-"Please choose the calendar" => "Proszę wybrać kalendarz",
 "create a new calendar" => "stwórz nowy kalendarz",
+"Import a calendar file" => "Zaimportuj plik kalendarza",
+"Please choose a calendar" => "Proszę wybierz kalendarz",
 "Name of new calendar" => "Nazwa kalendarza",
 "Import" => "Import",
-"Importing calendar" => "Importuje kalendarz",
-"Calendar imported successfully" => "Zaimportowano kalendarz",
 "Close Dialog" => "Zamknij okno",
 "Create a new event" => "Tworzenie nowego wydarzenia",
 "View an event" => "Zobacz wydarzenie",
 "No categories selected" => "nie zaznaczono kategorii",
-"Select category" => "Wybierz kategorię",
 "of" => "z",
 "at" => "w",
 "Timezone" => "Strefa czasowa",
-"Check always for changes of the timezone" => "Zawsze sprawdzaj zmiany strefy czasowej",
-"Timeformat" => "Format czasu",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Pierwszy dzień tygodnia",
-"Calendar CalDAV syncing address:" => "Adres synchronizacji kalendarza CalDAV:",
+"more info" => "więcej informacji",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Odczytać tylko linki iCalendar",
 "Users" => "Użytkownicy",
 "select users" => "wybierz użytkowników",
 "Editable" => "Edytowalne",
diff --git a/apps/calendar/l10n/pt_BR.php b/apps/calendar/l10n/pt_BR.php
index 95317eea0f7..b636c19bfe7 100644
--- a/apps/calendar/l10n/pt_BR.php
+++ b/apps/calendar/l10n/pt_BR.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Fuso horário alterado",
 "Invalid request" => "Pedido inválido",
 "Calendar" => "Calendário",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "Aniversário",
 "Business" => "Negócio",
 "Call" => "Chamada",
@@ -23,6 +28,7 @@
 "Questions" => "Perguntas",
 "Work" => "Trabalho",
 "unnamed" => "sem nome",
+"New Calendar" => "Novo Calendário",
 "Does not repeat" => "Não repetir",
 "Daily" => "Diariamente",
 "Weekly" => "Semanal",
@@ -68,7 +74,6 @@
 "Date" => "Data",
 "Cal." => "Cal.",
 "All day" => "Todo o dia",
-"New Calendar" => "Novo Calendário",
 "Missing fields" => "Campos incompletos",
 "Title" => "Título",
 "From Date" => "Desde a Data",
@@ -81,9 +86,6 @@
 "Month" => "Mês",
 "List" => "Lista",
 "Today" => "Hoje",
-"Calendars" => "Calendários",
-"There was a fail, while parsing the file." => "Houve uma falha, ao analisar o arquivo.",
-"Choose active calendars" => "Escolha calendários ativos",
 "Your calendars" => "Meus Calendários",
 "CalDav Link" => "Link para CalDav",
 "Shared calendars" => "Calendários Compartilhados",
@@ -132,27 +134,19 @@
 "Interval" => "Intervalo",
 "End" => "Final",
 "occurrences" => "ocorrências",
-"Import a calendar file" => "Importar um arquivo de calendário",
-"Please choose the calendar" => "Por favor, escolha o calendário",
 "create a new calendar" => "criar um novo calendário",
+"Import a calendar file" => "Importar um arquivo de calendário",
 "Name of new calendar" => "Nome do novo calendário",
 "Import" => "Importar",
-"Importing calendar" => "Importar calendário",
-"Calendar imported successfully" => "Calendário importado com sucesso",
 "Close Dialog" => "Fechar caixa de diálogo",
 "Create a new event" => "Criar um novo evento",
 "View an event" => "Visualizar evento",
 "No categories selected" => "Nenhuma categoria selecionada",
-"Select category" => "Selecionar categoria",
 "of" => "de",
 "at" => "para",
 "Timezone" => "Fuso horário",
-"Check always for changes of the timezone" => "Verificar sempre mudanças no fuso horário",
-"Timeformat" => "Formato da Hora",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Primeiro dia da semana",
-"Calendar CalDAV syncing address:" => "Sincronização de endereço do calendário CalDAV :",
 "Users" => "Usuários",
 "select users" => "Selecione usuários",
 "Editable" => "Editável",
diff --git a/apps/calendar/l10n/pt_PT.php b/apps/calendar/l10n/pt_PT.php
index 33f85569cca..cf816d8b347 100644
--- a/apps/calendar/l10n/pt_PT.php
+++ b/apps/calendar/l10n/pt_PT.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Zona horária alterada",
 "Invalid request" => "Pedido inválido",
 "Calendar" => "Calendário",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM aaaa",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, aaaa",
 "Birthday" => "Dia de anos",
 "Business" => "Negócio",
 "Call" => "Telefonar",
@@ -23,6 +28,7 @@
 "Questions" => "Perguntas",
 "Work" => "Trabalho",
 "unnamed" => "não definido",
+"New Calendar" => "Novo calendário",
 "Does not repeat" => "Não repete",
 "Daily" => "Diário",
 "Weekly" => "Semanal",
@@ -68,7 +74,6 @@
 "Date" => "Data",
 "Cal." => "Cal.",
 "All day" => "Todo o dia",
-"New Calendar" => "Novo calendário",
 "Missing fields" => "Falta campos",
 "Title" => "Título",
 "From Date" => "Da data",
@@ -81,9 +86,6 @@
 "Month" => "Mês",
 "List" => "Lista",
 "Today" => "Hoje",
-"Calendars" => "Calendários",
-"There was a fail, while parsing the file." => "Houve uma falha durante a análise do ficheiro",
-"Choose active calendars" => "Escolhe calendários ativos",
 "Your calendars" => "Os seus calendários",
 "CalDav Link" => "Endereço CalDav",
 "Shared calendars" => "Calendários partilhados",
@@ -132,27 +134,19 @@
 "Interval" => "Intervalo",
 "End" => "Fim",
 "occurrences" => "ocorrências",
-"Import a calendar file" => "Importar um ficheiro de calendário",
-"Please choose the calendar" => "Por favor escolhe o calendário",
 "create a new calendar" => "criar novo calendário",
+"Import a calendar file" => "Importar um ficheiro de calendário",
 "Name of new calendar" => "Nome do novo calendário",
 "Import" => "Importar",
-"Importing calendar" => "A importar calendário",
-"Calendar imported successfully" => "Calendário importado com sucesso",
 "Close Dialog" => "Fechar diálogo",
 "Create a new event" => "Criar novo evento",
 "View an event" => "Ver um evento",
 "No categories selected" => "Nenhuma categoria seleccionada",
-"Select category" => "Selecionar categoria",
 "of" => "de",
 "at" => "em",
 "Timezone" => "Zona horária",
-"Check always for changes of the timezone" => "Verificar sempre por alterações na zona horária",
-"Timeformat" => "Formato da hora",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Primeiro dia da semana",
-"Calendar CalDAV syncing address:" => "Endereço de sincronização CalDav do calendário",
 "Users" => "Utilizadores",
 "select users" => "Selecione utilizadores",
 "Editable" => "Editavel",
diff --git a/apps/calendar/l10n/ro.php b/apps/calendar/l10n/ro.php
index 550afcd102f..528d9ae108f 100644
--- a/apps/calendar/l10n/ro.php
+++ b/apps/calendar/l10n/ro.php
@@ -23,6 +23,7 @@
 "Questions" => "Întrebări",
 "Work" => "Servici",
 "unnamed" => "fără nume",
+"New Calendar" => "Calendar nou",
 "Does not repeat" => "Nerepetabil",
 "Daily" => "Zilnic",
 "Weekly" => "Săptămânal",
@@ -68,7 +69,6 @@
 "Date" => "Data",
 "Cal." => "Cal.",
 "All day" => "Toată ziua",
-"New Calendar" => "Calendar nou",
 "Missing fields" => "Câmpuri lipsă",
 "Title" => "Titlu",
 "From Date" => "Începând cu",
@@ -81,9 +81,6 @@
 "Month" => "Luna",
 "List" => "Listă",
 "Today" => "Astăzi",
-"Calendars" => "Calendare",
-"There was a fail, while parsing the file." => "A fost întâmpinată o eroare în procesarea fișierului",
-"Choose active calendars" => "Alege calendarele active",
 "Your calendars" => "Calendarele tale",
 "CalDav Link" => "Legătură CalDav",
 "Shared calendars" => "Calendare partajate",
@@ -132,27 +129,19 @@
 "Interval" => "Interval",
 "End" => "Sfârșit",
 "occurrences" => "repetiții",
-"Import a calendar file" => "Importă un calendar",
-"Please choose the calendar" => "Alegeți calendarul",
 "create a new calendar" => "crează un calendar nou",
+"Import a calendar file" => "Importă un calendar",
 "Name of new calendar" => "Numele noului calendar",
 "Import" => "Importă",
-"Importing calendar" => "Importă calendar",
-"Calendar imported successfully" => "Calendarul a fost importat cu succes",
 "Close Dialog" => "Închide",
 "Create a new event" => "Crează un eveniment nou",
 "View an event" => "Vizualizează un eveniment",
 "No categories selected" => "Nici o categorie selectată",
-"Select category" => "Selecteză categoria",
 "of" => "din",
 "at" => "la",
 "Timezone" => "Fus orar",
-"Check always for changes of the timezone" => "Verifică mereu pentru schimbări ale fusului orar",
-"Timeformat" => "Forma de afișare a orei",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Prima zi a săptămînii",
-"Calendar CalDAV syncing address:" => "Adresa pentru sincronizarea calendarului CalDAV",
 "Users" => "Utilizatori",
 "select users" => "utilizatori selectați",
 "Editable" => "Editabil",
diff --git a/apps/calendar/l10n/ru.php b/apps/calendar/l10n/ru.php
index 934e2c4840a..9c27d367daf 100644
--- a/apps/calendar/l10n/ru.php
+++ b/apps/calendar/l10n/ru.php
@@ -111,9 +111,6 @@
 "Month" => "Месяц",
 "List" => "Список",
 "Today" => "Сегодня",
-"Calendars" => "Календари",
-"There was a fail, while parsing the file." => "Не удалось обработать файл.",
-"Choose active calendars" => "Выберите активные календари",
 "Your calendars" => "Ваши календари",
 "CalDav Link" => "Ссылка для CalDav",
 "Shared calendars" => "Общие календари",
@@ -174,11 +171,8 @@
 "of" => "из",
 "at" => "на",
 "Timezone" => "Часовой пояс",
-"Check always for changes of the timezone" => "Всегда проверяйте изменение часового пояса",
-"Timeformat" => "Формат времени",
 "24h" => "24ч",
 "12h" => "12ч",
-"First day of the week" => "Первый день недели",
 "more info" => "подробнее",
 "Users" => "Пользователи",
 "select users" => "выбрать пользователей",
diff --git a/apps/calendar/l10n/sk_SK.php b/apps/calendar/l10n/sk_SK.php
index e182a9d3ea4..65400c496d7 100644
--- a/apps/calendar/l10n/sk_SK.php
+++ b/apps/calendar/l10n/sk_SK.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Časové pásmo zmenené",
 "Invalid request" => "Neplatná požiadavka",
 "Calendar" => "Kalendár",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM rrrr",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d. MMM[ yyyy]{ '&#8212;' d.[ MMM] yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, rrrr",
 "Birthday" => "Narodeniny",
 "Business" => "Podnikanie",
 "Call" => "Hovor",
@@ -23,6 +28,7 @@
 "Questions" => "Otázky",
 "Work" => "Práca",
 "unnamed" => "nepomenovaný",
+"New Calendar" => "Nový kalendár",
 "Does not repeat" => "Neopakovať",
 "Daily" => "Denne",
 "Weekly" => "Týždenne",
@@ -68,7 +74,6 @@
 "Date" => "Dátum",
 "Cal." => "Kal.",
 "All day" => "Celý deň",
-"New Calendar" => "Nový kalendár",
 "Missing fields" => "Nevyplnené položky",
 "Title" => "Nadpis",
 "From Date" => "Od dátumu",
@@ -81,9 +86,6 @@
 "Month" => "Mesiac",
 "List" => "Zoznam",
 "Today" => "Dnes",
-"Calendars" => "Kalendáre",
-"There was a fail, while parsing the file." => "Nastala chyba počas parsovania súboru.",
-"Choose active calendars" => "Zvoľte aktívne kalendáre",
 "Your calendars" => "Vaše kalendáre",
 "CalDav Link" => "CalDav odkaz",
 "Shared calendars" => "Zdielané kalendáre",
@@ -132,27 +134,19 @@
 "Interval" => "Interval",
 "End" => "Koniec",
 "occurrences" => "výskyty",
-"Import a calendar file" => "Importovať súbor kalendára",
-"Please choose the calendar" => "Prosím zvoľte kalendár",
 "create a new calendar" => "vytvoriť nový kalendár",
+"Import a calendar file" => "Importovať súbor kalendára",
 "Name of new calendar" => "Meno nového kalendára",
 "Import" => "Importovať",
-"Importing calendar" => "Importujem kalendár",
-"Calendar imported successfully" => "Kalendár úspešne importovaný",
 "Close Dialog" => "Zatvoriť dialóg",
 "Create a new event" => "Vytvoriť udalosť",
 "View an event" => "Zobraziť udalosť",
 "No categories selected" => "Žiadne vybraté kategórie",
-"Select category" => "Vybrať kategóriu",
 "of" => "z",
 "at" => "v",
 "Timezone" => "Časová zóna",
-"Check always for changes of the timezone" => "Vždy kontroluj zmeny časového pásma",
-"Timeformat" => "Formát času",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Prvý deň v týždni",
-"Calendar CalDAV syncing address:" => "Synchronizačná adresa kalendára CalDAV: ",
 "Users" => "Používatelia",
 "select users" => "vybrať používateľov",
 "Editable" => "Upravovateľné",
diff --git a/apps/calendar/l10n/sl.php b/apps/calendar/l10n/sl.php
index 3bf03ede127..7a488751c4f 100644
--- a/apps/calendar/l10n/sl.php
+++ b/apps/calendar/l10n/sl.php
@@ -6,7 +6,12 @@
 "Timezone changed" => "Časovni pas je bil spremenjen",
 "Invalid request" => "Neveljaven zahtevek",
 "Calendar" => "Koledar",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "Rojstni dan",
 "Business" => "Poslovno",
 "Call" => "Pokliči",
@@ -23,6 +28,7 @@
 "Questions" => "Vprašanja",
 "Work" => "Delo",
 "unnamed" => "neimenovan",
+"New Calendar" => "Nov koledar",
 "Does not repeat" => "Se ne ponavlja",
 "Daily" => "Dnevno",
 "Weekly" => "Tedensko",
@@ -68,7 +74,6 @@
 "Date" => "Datum",
 "Cal." => "Kol.",
 "All day" => "Cel dan",
-"New Calendar" => "Nov koledar",
 "Missing fields" => "Mankajoča polja",
 "Title" => "Naslov",
 "From Date" => "od Datum",
@@ -81,9 +86,6 @@
 "Month" => "Mesec",
 "List" => "Seznam",
 "Today" => "Danes",
-"Calendars" => "Koledarji",
-"There was a fail, while parsing the file." => "Pri razčlenjevanju datoteke je prišlo do napake.",
-"Choose active calendars" => "Izberite aktivne koledarje",
 "Your calendars" => "Vaši koledarji",
 "CalDav Link" => "CalDav povezava",
 "Shared calendars" => "Koledarji v souporabi",
@@ -132,27 +134,19 @@
 "Interval" => "Časovni razmik",
 "End" => "Konec",
 "occurrences" => "ponovitev",
-"Import a calendar file" => "Uvozi datoteko koledarja",
-"Please choose the calendar" => "Izberi koledar",
 "create a new calendar" => "Ustvari nov koledar",
+"Import a calendar file" => "Uvozi datoteko koledarja",
 "Name of new calendar" => "Ime novega koledarja",
 "Import" => "Uvozi",
-"Importing calendar" => "Uvažam koledar",
-"Calendar imported successfully" => "Koledar je bil uspešno uvožen",
 "Close Dialog" => "Zapri dialog",
 "Create a new event" => "Ustvari nov dogodek",
 "View an event" => "Poglej dogodek",
 "No categories selected" => "Nobena kategorija ni izbrana",
-"Select category" => "Izberi kategorijo",
 "of" => "od",
 "at" => "pri",
 "Timezone" => "Časovni pas",
-"Check always for changes of the timezone" => "Vedno preveri za spremembe časovnega pasu",
-"Timeformat" => "Zapis časa",
 "24h" => "24ur",
 "12h" => "12ur",
-"First day of the week" => "Prvi dan v tednu",
-"Calendar CalDAV syncing address:" => "CalDAV sinhronizacijski naslov koledarja:",
 "Users" => "Uporabniki",
 "select users" => "izberite uporabnike",
 "Editable" => "Možno urejanje",
diff --git a/apps/calendar/l10n/sr.php b/apps/calendar/l10n/sr.php
index 5798c66e0ab..4ec60e20cbe 100644
--- a/apps/calendar/l10n/sr.php
+++ b/apps/calendar/l10n/sr.php
@@ -18,6 +18,7 @@
 "Projects" => "Пројекти",
 "Questions" => "Питања",
 "Work" => "Посао",
+"New Calendar" => "Нови календар",
 "Does not repeat" => "Не понавља се",
 "Daily" => "дневно",
 "Weekly" => "недељно",
@@ -26,15 +27,11 @@
 "Monthly" => "месечно",
 "Yearly" => "годишње",
 "All day" => "Цео дан",
-"New Calendar" => "Нови календар",
 "Title" => "Наслов",
 "Week" => "Недеља",
 "Month" => "Месец",
 "List" => "Списак",
 "Today" => "Данас",
-"Calendars" => "Календари",
-"There was a fail, while parsing the file." => "дошло је до грешке при расчлањивању фајла.",
-"Choose active calendars" => "Изаберите активне календаре",
 "CalDav Link" => "КалДав веза",
 "Download" => "Преузми",
 "Edit" => "Уреди",
@@ -59,6 +56,5 @@
 "Description of the Event" => "Опис догађаја",
 "Repeat" => "Понављај",
 "Create a new event" => "Направи нови догађај",
-"Select category" => "Изаберите категорију",
 "Timezone" => "Временска зона"
 );
diff --git a/apps/calendar/l10n/sr@latin.php b/apps/calendar/l10n/sr@latin.php
index c261f903f76..4ceabcbae59 100644
--- a/apps/calendar/l10n/sr@latin.php
+++ b/apps/calendar/l10n/sr@latin.php
@@ -18,6 +18,7 @@
 "Projects" => "Projekti",
 "Questions" => "Pitanja",
 "Work" => "Posao",
+"New Calendar" => "Novi kalendar",
 "Does not repeat" => "Ne ponavlja se",
 "Daily" => "dnevno",
 "Weekly" => "nedeljno",
@@ -26,15 +27,11 @@
 "Monthly" => "mesečno",
 "Yearly" => "godišnje",
 "All day" => "Ceo dan",
-"New Calendar" => "Novi kalendar",
 "Title" => "Naslov",
 "Week" => "Nedelja",
 "Month" => "Mesec",
 "List" => "Spisak",
 "Today" => "Danas",
-"Calendars" => "Kalendari",
-"There was a fail, while parsing the file." => "došlo je do greške pri rasčlanjivanju fajla.",
-"Choose active calendars" => "Izaberite aktivne kalendare",
 "CalDav Link" => "KalDav veza",
 "Download" => "Preuzmi",
 "Edit" => "Uredi",
@@ -59,6 +56,5 @@
 "Description of the Event" => "Opis događaja",
 "Repeat" => "Ponavljaj",
 "Create a new event" => "Napravi novi događaj",
-"Select category" => "Izaberite kategoriju",
 "Timezone" => "Vremenska zona"
 );
diff --git a/apps/calendar/l10n/sv.php b/apps/calendar/l10n/sv.php
index e29e96b4631..7baa0309a64 100644
--- a/apps/calendar/l10n/sv.php
+++ b/apps/calendar/l10n/sv.php
@@ -112,9 +112,6 @@
 "Month" => "Månad",
 "List" => "Lista",
 "Today" => "Idag",
-"Calendars" => "Kalendrar",
-"There was a fail, while parsing the file." => "Det blev ett fel medan filen analyserades.",
-"Choose active calendars" => "Välj aktiva kalendrar",
 "Your calendars" => "Dina kalendrar",
 "CalDav Link" => "CalDAV-länk",
 "Shared calendars" => "Delade kalendrar",
@@ -177,11 +174,8 @@
 "of" => "av",
 "at" => "på",
 "Timezone" => "Tidszon",
-"Check always for changes of the timezone" => "Kontrollera alltid ändringar i tidszon.",
-"Timeformat" => "Tidsformat",
 "24h" => "24h",
 "12h" => "12h",
-"First day of the week" => "Första dagen av veckan",
 "Cache" => "Cache",
 "Clear cache for repeating events" => "Töm cache för upprepade händelser",
 "Calendar CalDAV syncing addresses" => "Kalender CalDAV synkroniserar adresser",
diff --git a/apps/calendar/l10n/th_TH.php b/apps/calendar/l10n/th_TH.php
index 8aaa7ae756a..0b92a623d40 100644
--- a/apps/calendar/l10n/th_TH.php
+++ b/apps/calendar/l10n/th_TH.php
@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "ไม่ใช่ปฏิทินทั้งหมดที่จะถูกจัดเก็บข้อมูลไว้ในหน่วยความจำแคชอย่างสมบูรณ์",
+"Everything seems to be completely cached" => "ทุกสิ่งทุกอย่างได้ถูกเก็บเข้าไปไว้ในหน่วยความจำแคชอย่างสมบูรณ์แล้ว",
 "No calendars found." => "ไม่พบปฏิทินที่ต้องการ",
 "No events found." => "ไม่พบกิจกรรมที่ต้องการ",
 "Wrong calendar" => "ปฏิทินไม่ถูกต้อง",
+"The file contained either no events or all events are already saved in your calendar." => "ไฟล์ดังกล่าวบรรจุข้อมูลกิจกรรมที่มีอยู่แล้วในปฏิทินของคุณ",
+"events has been saved in the new calendar" => "กิจกรรมได้ถูกบันทึกไปไว้ในปฏิทินที่สร้างขึ้นใหม่แล้ว",
+"Import failed" => "การนำเข้าข้อมูลล้มเหลว",
+"events has been saved in your calendar" => "กิจกรรมได้ถูกบันทึกเข้าไปไว้ในปฏิทินของคุณแล้ว",
 "New Timezone:" => "สร้างโซนเวลาใหม่:",
 "Timezone changed" => "โซนเวลาถูกเปลี่ยนแล้ว",
 "Invalid request" => "คำร้องขอไม่ถูกต้อง",
 "Calendar" => "ปฏิทิน",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "วันเกิด",
 "Business" => "ธุรกิจ",
 "Call" => "โทรติดต่อ",
@@ -22,7 +33,9 @@
 "Projects" => "โครงการ",
 "Questions" => "คำถาม",
 "Work" => "งาน",
+"by" => "โดย",
 "unnamed" => "ไม่มีชื่อ",
+"New Calendar" => "สร้างปฏิทินใหม่",
 "Does not repeat" => "ไม่ต้องทำซ้ำ",
 "Daily" => "รายวัน",
 "Weekly" => "รายสัปดาห์",
@@ -67,8 +80,26 @@
 "by day and month" => "ตามวันและเดือน",
 "Date" => "วันที่",
 "Cal." => "คำนวณ",
+"Sun." => "อา.",
+"Mon." => "จ.",
+"Tue." => "อ.",
+"Wed." => "พ.",
+"Thu." => "พฤ.",
+"Fri." => "ศ.",
+"Sat." => "ส.",
+"Jan." => "ม.ค.",
+"Feb." => "ก.พ.",
+"Mar." => "มี.ค.",
+"Apr." => "เม.ย.",
+"May." => "พ.ค.",
+"Jun." => "มิ.ย.",
+"Jul." => "ก.ค.",
+"Aug." => "ส.ค.",
+"Sep." => "ก.ย.",
+"Oct." => "ต.ค.",
+"Nov." => "พ.ย.",
+"Dec." => "ธ.ค.",
 "All day" => "ทั้งวัน",
-"New Calendar" => "สร้างปฏิทินใหม่",
 "Missing fields" => "ช่องฟิลด์เกิดการสูญหาย",
 "Title" => "ชื่อกิจกรรม",
 "From Date" => "จากวันที่",
@@ -81,9 +112,7 @@
 "Month" => "เดือน",
 "List" => "รายการ",
 "Today" => "วันนี้",
-"Calendars" => "ปฏิทิน",
-"There was a fail, while parsing the file." => "เกิดความล้มเหลวในการแยกไฟล์",
-"Choose active calendars" => "เลือกปฏิทินที่ต้องการใช้งาน",
+"Settings" => "ตั้งค่า",
 "Your calendars" => "ปฏิทินของคุณ",
 "CalDav Link" => "ลิงค์ CalDav",
 "Shared calendars" => "ปฏิทินที่เปิดแชร์",
@@ -132,27 +161,34 @@
 "Interval" => "ช่วงเวลา",
 "End" => "สิ้นสุด",
 "occurrences" => "จำนวนที่ปรากฏ",
-"Import a calendar file" => "นำเข้าไฟล์ปฏิทิน",
-"Please choose the calendar" => "กรณาเลือกปฏิทิน",
 "create a new calendar" => "สร้างปฏิทินใหม่",
+"Import a calendar file" => "นำเข้าไฟล์ปฏิทิน",
+"Please choose a calendar" => "กรุณาเลือกปฏิทิน",
 "Name of new calendar" => "ชื่อของปฏิทิน",
+"Take an available name!" => "เลือกชื่อที่ต้องการ",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "ปฏิทินชื่อดังกล่าวถูกใช้งานไปแล้ว หากคุณยังดำเนินการต่อไป ปฏิทินดังกล่าวนี้จะถูกผสานข้อมูลเข้าด้วยกัน",
 "Import" => "นำเข้าข้อมูล",
-"Importing calendar" => "นำเข้าข้อมูลปฏิทิน",
-"Calendar imported successfully" => "ปฏิทินถูกนำเข้าข้อมูลเรียบร้อยแล้ว",
 "Close Dialog" => "ปิดกล่องข้อความโต้ตอบ",
 "Create a new event" => "สร้างกิจกรรมใหม่",
 "View an event" => "ดูกิจกรรม",
 "No categories selected" => "ยังไม่ได้เลือกหมวดหมู่",
-"Select category" => "เลือกหมวดหมู่",
 "of" => "ของ",
 "at" => "ที่",
+"General" => "ทั่วไป",
 "Timezone" => "โซนเวลา",
-"Check always for changes of the timezone" => "ตรวจสอบการเปลี่ยนแปลงโซนเวลาอยู่เสมอ",
-"Timeformat" => "รูปแบบการแสดงเวลา",
+"Update timezone automatically" => "อัพเดทโซนเวลาอัตโนมัติ",
+"Time format" => "รูปแบบเวลา",
 "24h" => "24 ช.ม.",
 "12h" => "12 ช.ม.",
-"First day of the week" => "วันแรกของสัปดาห์",
-"Calendar CalDAV syncing address:" => "ที่อยู่ในการเชื่อมข้อมูลกับปฏิทิน CalDav:",
+"Start week on" => "เริ่มต้นสัปดาห์ด้วย",
+"Cache" => "หน่วยความจำแคช",
+"Clear cache for repeating events" => "ล้างข้อมูลในหน่วยความจำแคชสำหรับกิจกรรมที่ซ้ำซ้อน",
+"URLs" => "URLs",
+"Calendar CalDAV syncing addresses" => "ที่อยู่ที่ใช้สำหรับเชื่อมข้อมูลปฏิทิน CalDAV",
+"more info" => "ข้อมูลเพิ่มเติม",
+"Primary address (Kontact et al)" => "ที่อยู่หลัก (Kontact et al)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "อ่านเฉพาะลิงก์ iCalendar เท่านั้น",
 "Users" => "ผู้ใช้งาน",
 "select users" => "เลือกผู้ใช้งาน",
 "Editable" => "สามารถแก้ไขได้",
diff --git a/apps/calendar/l10n/tr.php b/apps/calendar/l10n/tr.php
index 912228dc72a..b9256eb619e 100644
--- a/apps/calendar/l10n/tr.php
+++ b/apps/calendar/l10n/tr.php
@@ -112,9 +112,6 @@
 "Month" => "Ay",
 "List" => "Liste",
 "Today" => "Bugün",
-"Calendars" => "Takvimler",
-"There was a fail, while parsing the file." => "Dosya okunurken başarısızlık oldu.",
-"Choose active calendars" => "Aktif takvimleri seçin",
 "Your calendars" => "Takvimleriniz",
 "CalDav Link" => "CalDav Bağlantısı",
 "Shared calendars" => "Paylaşılan",
@@ -177,11 +174,8 @@
 "of" => "nın",
 "at" => "üzerinde",
 "Timezone" => "Zaman dilimi",
-"Check always for changes of the timezone" => "Sürekli zaman dilimi değişikliklerini kontrol et",
-"Timeformat" => "Saat biçimi",
 "24h" => "24s",
 "12h" => "12s",
-"First day of the week" => "Haftanın ilk günü",
 "Cache" => "Önbellek",
 "Clear cache for repeating events" => "Tekrar eden etkinlikler için ön belleği temizle.",
 "Calendar CalDAV syncing addresses" => "CalDAV takvimi adresleri senkronize ediyor.",
diff --git a/apps/calendar/l10n/uk.php b/apps/calendar/l10n/uk.php
index 892896742da..2911307e588 100644
--- a/apps/calendar/l10n/uk.php
+++ b/apps/calendar/l10n/uk.php
@@ -16,6 +16,7 @@
 "Projects" => "Проекти",
 "Questions" => "Запитання",
 "Work" => "Робота",
+"New Calendar" => "новий Календар",
 "Does not repeat" => "Не повторювати",
 "Daily" => "Щоденно",
 "Weekly" => "Щотижня",
@@ -52,21 +53,29 @@
 "Date" => "Дата",
 "Cal." => "Кал.",
 "All day" => "Увесь день",
-"New Calendar" => "новий Календар",
+"Missing fields" => "Пропущені поля",
 "Title" => "Назва",
+"From Date" => "Від Дати",
+"From Time" => "З Часу",
+"To Date" => "До Часу",
+"To Time" => "По Дату",
+"The event ends before it starts" => "Подія завершається до її початку",
+"There was a database fail" => "Сталася помилка бази даних",
 "Week" => "Тиждень",
 "Month" => "Місяць",
 "List" => "Список",
 "Today" => "Сьогодні",
-"Calendars" => "Календарі",
-"There was a fail, while parsing the file." => "Сталася помилка при обробці файлу",
-"Choose active calendars" => "Вибрати активні календарі",
+"Your calendars" => "Ваші календарі",
 "Download" => "Завантажити",
 "Edit" => "Редагувати",
+"Delete" => "Видалити",
 "New calendar" => "Новий календар",
 "Edit calendar" => "Редагувати календар",
 "Active" => "Активний",
 "Calendar color" => "Колір календаря",
+"Save" => "Зберегти",
+"Cancel" => "Відмінити",
+"Export" => "Експорт",
 "Title of the Event" => "Назва події",
 "Category" => "Категорія",
 "From" => "З",
@@ -76,14 +85,14 @@
 "Description" => "Опис",
 "Description of the Event" => "Опис події",
 "Repeat" => "Повторювати",
-"Import a calendar file" => "Імпортувати файл календаря",
 "create a new calendar" => "створити новий календар",
+"Import a calendar file" => "Імпортувати файл календаря",
 "Name of new calendar" => "Назва нового календаря",
-"Calendar imported successfully" => "Календар успішно імпортовано",
+"Import" => "Імпорт",
 "Create a new event" => "Створити нову подію",
 "Timezone" => "Часовий пояс",
-"Timeformat" => "Формат часу",
 "24h" => "24г",
 "12h" => "12г",
-"Calendar CalDAV syncing address:" => "Адреса синхронізації календаря CalDAV:"
+"Users" => "Користувачі",
+"Groups" => "Групи"
 );
diff --git a/apps/calendar/l10n/vi.php b/apps/calendar/l10n/vi.php
index 059b89e1635..3594a095eba 100644
--- a/apps/calendar/l10n/vi.php
+++ b/apps/calendar/l10n/vi.php
@@ -79,9 +79,6 @@
 "Month" => "Tháng",
 "List" => "Danh sách",
 "Today" => "Hôm nay",
-"Calendars" => "Lịch",
-"There was a fail, while parsing the file." => "Có một thất bại, trong khi phân tích các tập tin.",
-"Choose active calendars" => "Chọn lịch hoạt động",
 "Your calendars" => "Lịch của bạn",
 "CalDav Link" => "Liên kết CalDav ",
 "Shared calendars" => "Chia sẻ lịch",
@@ -129,7 +126,6 @@
 "of" => "của",
 "at" => "tại",
 "Timezone" => "Múi giờ",
-"Check always for changes of the timezone" => "Luôn kiểm tra múi giờ",
 "24h" => "24h",
 "12h" => "12h"
 );
diff --git a/apps/calendar/l10n/zh_CN.GB2312.php b/apps/calendar/l10n/zh_CN.GB2312.php
new file mode 100644
index 00000000000..38f039e6611
--- /dev/null
+++ b/apps/calendar/l10n/zh_CN.GB2312.php
@@ -0,0 +1,121 @@
+<?php $TRANSLATIONS = array(
+"Wrong calendar" => "错误的日历",
+"New Timezone:" => "新时区",
+"Timezone changed" => "时区改变了",
+"Invalid request" => "非法请求",
+"Calendar" => "日历",
+"Birthday" => "生日",
+"Business" => "商务",
+"Call" => "呼叫",
+"Clients" => "客户端",
+"Deliverer" => "交付者",
+"Holidays" => "假期",
+"Ideas" => "灵感",
+"Journey" => "旅行",
+"Jubilee" => "五十年纪念",
+"Meeting" => "会面",
+"Other" => "其它",
+"Personal" => "个人的",
+"Projects" => "项目",
+"Questions" => "问题",
+"Work" => "工作",
+"New Calendar" => "新的日历",
+"Does not repeat" => "不要重复",
+"Daily" => "每天",
+"Weekly" => "每星期",
+"Every Weekday" => "每个周末",
+"Bi-Weekly" => "每两周",
+"Monthly" => "每个月",
+"Yearly" => "每年",
+"never" => "从不",
+"by occurrences" => "根据发生时",
+"by date" => "根据日期",
+"by monthday" => "根据月天",
+"by weekday" => "根据星期",
+"Monday" => "星期一",
+"Tuesday" => "星期二",
+"Wednesday" => "星期三",
+"Thursday" => "星期四",
+"Friday" => "星期五",
+"Saturday" => "星期六",
+"Sunday" => "星期天",
+"events week of month" => "时间每月发生的周数",
+"first" => "首先",
+"second" => "其次",
+"third" => "第三",
+"fourth" => "第四",
+"fifth" => "第五",
+"last" => "最后",
+"January" => "一月",
+"February" => "二月",
+"March" => "三月",
+"April" => "四月",
+"May" => "五月",
+"June" => "六月",
+"July" => "七月",
+"August" => "八月",
+"September" => "九月",
+"October" => "十月",
+"November" => "十一月",
+"December" => "十二月",
+"by events date" => "根据时间日期",
+"by yearday(s)" => "根据年数",
+"by weeknumber(s)" => "根据周数",
+"by day and month" => "根据天和月",
+"Date" => "日期",
+"Cal." => "Cal.",
+"All day" => "整天",
+"Missing fields" => "丢失的输入框",
+"Title" => "标题",
+"From Date" => "从日期",
+"From Time" => "从时间",
+"To Date" => "到日期",
+"To Time" => "到时间",
+"The event ends before it starts" => "在它开始前需要结束的事件",
+"There was a database fail" => "发生了一个数据库失败",
+"Week" => "星期",
+"Month" => "月",
+"List" => "列表",
+"Today" => "今天",
+"CalDav Link" => "CalDav 链接",
+"Download" => "下载",
+"Edit" => "编辑",
+"Delete" => "删除",
+"New calendar" => "新的日历",
+"Edit calendar" => "编辑日历",
+"Displayname" => "显示名称",
+"Active" => "活动",
+"Calendar color" => "日历颜色",
+"Save" => "保存",
+"Submit" => "提交",
+"Cancel" => " 取消",
+"Edit an event" => "编辑一个事件",
+"Export" => "导出",
+"Title of the Event" => "事件的标题",
+"Category" => "分类",
+"All Day Event" => "每天的事件",
+"From" => "从",
+"To" => "到",
+"Advanced options" => "进阶选项",
+"Location" => "地点",
+"Location of the Event" => "事件的地点",
+"Description" => "解释",
+"Description of the Event" => "事件描述",
+"Repeat" => "重复",
+"Advanced" => "进阶",
+"Select weekdays" => "选择星期",
+"Select days" => "选择日",
+"and the events day of year." => "选择每年时间发生天数",
+"and the events day of month." => "选择每个月事件发生的天",
+"Select months" => "选择月份",
+"Select weeks" => "选择星期",
+"and the events week of year." => "每年时间发生的星期",
+"Interval" => "间隔",
+"End" => "结束",
+"occurrences" => "发生",
+"Import" => "导入",
+"Create a new event" => "新建一个时间",
+"Timezone" => "时区",
+"24h" => "24小时",
+"12h" => "12小时"
+);
diff --git a/apps/calendar/l10n/zh_CN.php b/apps/calendar/l10n/zh_CN.php
index bb7e0a28724..48d00d02d5f 100644
--- a/apps/calendar/l10n/zh_CN.php
+++ b/apps/calendar/l10n/zh_CN.php
@@ -6,6 +6,7 @@
 "Timezone changed" => "时区已修改",
 "Invalid request" => "非法请求",
 "Calendar" => "日历",
+"ddd" => "ddd",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
 "Birthday" => "生日",
 "Business" => "商务",
@@ -23,6 +24,7 @@
 "Questions" => "问题",
 "Work" => "工作",
 "unnamed" => "未命名",
+"New Calendar" => "新日历",
 "Does not repeat" => "不重复",
 "Daily" => "每天",
 "Weekly" => "每周",
@@ -68,7 +70,6 @@
 "Date" => "日期",
 "Cal." => "日历",
 "All day" => "全天",
-"New Calendar" => "新日历",
 "Missing fields" => "缺少字段",
 "Title" => "标题",
 "From Date" => "从",
@@ -81,9 +82,6 @@
 "Month" => "月",
 "List" => "列表",
 "Today" => "今天",
-"Calendars" => "日历",
-"There was a fail, while parsing the file." => "解析文件失败",
-"Choose active calendars" => "选择活动日历",
 "Your calendars" => "您的日历",
 "CalDav Link" => "CalDav 链接",
 "Shared calendars" => "共享的日历",
@@ -132,27 +130,19 @@
 "Interval" => "间隔",
 "End" => "结束",
 "occurrences" => "次",
-"Import a calendar file" => "导入日历文件",
-"Please choose the calendar" => "请选择日历",
 "create a new calendar" => "创建新日历",
+"Import a calendar file" => "导入日历文件",
 "Name of new calendar" => "新日历名称",
 "Import" => "导入",
-"Importing calendar" => "导入日历",
-"Calendar imported successfully" => "导入日历成功",
 "Close Dialog" => "关闭对话框",
 "Create a new event" => "创建新事件",
 "View an event" => "查看事件",
 "No categories selected" => "无选中分类",
-"Select category" => "选择分类",
 "of" => "在",
 "at" => "在",
 "Timezone" => "时区",
-"Check always for changes of the timezone" => "选中则总是按照时区变化",
-"Timeformat" => "时间格式",
 "24h" => "24小时",
 "12h" => "12小时",
-"First day of the week" => "每周的第一天",
-"Calendar CalDAV syncing address:" => "日历CalDAV 同步地址：",
 "Users" => "用户",
 "select users" => "选中用户",
 "Editable" => "可编辑",
diff --git a/apps/calendar/l10n/zh_TW.php b/apps/calendar/l10n/zh_TW.php
index 746594462c4..c2c03a4d44e 100644
--- a/apps/calendar/l10n/zh_TW.php
+++ b/apps/calendar/l10n/zh_TW.php
@@ -23,6 +23,7 @@
 "Questions" => "問題",
 "Work" => "工作",
 "unnamed" => "無名稱的",
+"New Calendar" => "新日曆",
 "Does not repeat" => "不重覆",
 "Daily" => "每日",
 "Weekly" => "每週",
@@ -68,7 +69,6 @@
 "Date" => "日期",
 "Cal." => "行事曆",
 "All day" => "整天",
-"New Calendar" => "新日曆",
 "Missing fields" => "遺失欄位",
 "Title" => "標題",
 "From Date" => "自日期",
@@ -81,9 +81,6 @@
 "Month" => "月",
 "List" => "清單",
 "Today" => "今日",
-"Calendars" => "日曆",
-"There was a fail, while parsing the file." => "解析檔案時失敗。",
-"Choose active calendars" => "選擇一個作用中的日曆",
 "Your calendars" => "你的行事曆",
 "CalDav Link" => "CalDav 聯結",
 "Shared calendars" => "分享的行事曆",
@@ -132,27 +129,19 @@
 "Interval" => "間隔",
 "End" => "結束",
 "occurrences" => "事件",
-"Import a calendar file" => "匯入日曆檔案",
-"Please choose the calendar" => "請選擇日曆",
 "create a new calendar" => "建立新日曆",
+"Import a calendar file" => "匯入日曆檔案",
 "Name of new calendar" => "新日曆名稱",
 "Import" => "匯入",
-"Importing calendar" => "匯入日曆",
-"Calendar imported successfully" => "已成功匯入日曆",
 "Close Dialog" => "關閉對話",
 "Create a new event" => "建立一個新事件",
 "View an event" => "觀看一個活動",
 "No categories selected" => "沒有選擇分類",
-"Select category" => "選擇分類",
 "of" => "於",
 "at" => "於",
 "Timezone" => "時區",
-"Check always for changes of the timezone" => "總是檢查是否變更了時區",
-"Timeformat" => "日期格式",
 "24h" => "24小時制",
 "12h" => "12小時制",
-"First day of the week" => "每週的第一天",
-"Calendar CalDAV syncing address:" => "CalDAV 的日曆同步地址：",
 "Users" => "使用者",
 "select users" => "選擇使用者",
 "Editable" => "可編輯",
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index c94cc755ab3..15891aafd9e 100644
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -44,7 +44,7 @@
 					<form id="choosecalendar">
 						<!--<input type="button" id="today_input" value="<?php echo $l->t("Today");?>"/>-->
 						<a class="settings calendarsettings" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('calendar', 'icon.svg'); ?>" alt="<?php echo $l->t('Settings'); ?>" /></a>
-						<a class="settings generalsettings" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="core/img/actions/settings.svg" alt="<?php echo $l->t('Settings'); ?>" /></a>
+						<a class="settings generalsettings" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('core', 'actions/settings.svg'); ?>" alt="<?php echo $l->t('Settings'); ?>" /></a>
 					</form>
 					<form id="datecontrol">
 						<input type="button" value="&nbsp;&lt;&nbsp;" id="datecontrol_left"/>
diff --git a/apps/calendar/templates/share.dropdown.php b/apps/calendar/templates/share.dropdown.php
index 07b4c4bced5..391ae83765b 100644
--- a/apps/calendar/templates/share.dropdown.php
+++ b/apps/calendar/templates/share.dropdown.php
@@ -33,7 +33,7 @@ echo OCP\html_select_options($allusers, array());
 </select><br>
 <ul id="sharewithuser_list">
 <?php foreach($users as $user): ?>
-	<li id="sharewithuser_<?php echo $user['share']; ?>"><input type="checkbox" width="12px" <?php echo ($user['permissions']?'checked="checked"':'')?> style="visibility:hidden;" title="<?php echo $l->t('Editable'); ?>"><?php echo $user['share']; ?><img src="<?php echo  OC::$WEBROOT; ?>/core/img/actions/delete.svg" class="svg action" style="display:none;float:right;"></li>
+	<li id="sharewithuser_<?php echo $user['share']; ?>"><input type="checkbox" width="12px" <?php echo ($user['permissions']?'checked="checked"':'')?> style="visibility:hidden;" title="<?php echo $l->t('Editable'); ?>"><?php echo $user['share']; ?><img src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg'); ?>" class="svg action" style="display:none;float:right;"></li>
 	<script>
 		$('#sharewithuser_<?php echo $user['share']; ?> > img').click(function(){
 			$('#share_user option[value="<?php echo $user['share']; ?>"]').removeAttr('disabled');
@@ -59,7 +59,7 @@ echo OCP\html_select_options($allgroups, array());
 </select><br>
 <ul id="sharewithgroup_list">
 <?php foreach($groups as $group): ?>
-	<li id="sharewithgroup_<?php echo $group['share']; ?>"><input type="checkbox" width="12px" <?php echo ($group['permissions']?'checked="checked"':'')?> style="visibility:hidden;" title="<?php echo $l->t('Editable'); ?>"><?php echo $group['share']; ?><img src="<?php echo  OC::$WEBROOT; ?>/core/img/actions/delete.svg" class="svg action" style="display:none;float:right;"></li>
+	<li id="sharewithgroup_<?php echo $group['share']; ?>"><input type="checkbox" width="12px" <?php echo ($group['permissions']?'checked="checked"':'')?> style="visibility:hidden;" title="<?php echo $l->t('Editable'); ?>"><?php echo $group['share']; ?><img src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg'); ?>" class="svg action" style="display:none;float:right;"></li>
 	<script>
 		$('#sharewithgroup_<?php echo $group['share']; ?> > img').click(function(){
 			$('#share_group option[value="<?php echo $group['share']; ?>"]').removeAttr('disabled');
diff --git a/apps/contacts/ajax/contact/add.php b/apps/contacts/ajax/contact/add.php
index 043e947dc4b..c7cec7d9461 100644
--- a/apps/contacts/ajax/contact/add.php
+++ b/apps/contacts/ajax/contact/add.php
@@ -49,10 +49,14 @@ if(!$id) {
 	exit();
 }
 
+$lastmodified = OC_Contacts_App::lastModified($vcard);
+if(!$lastmodified) {
+	$lastmodified = new DateTime();
+}
 OCP\JSON::success(array(
 	'data' => array(
 		'id' => $id,
 		'aid' => $aid,
-		'lastmodified' => OC_Contacts_VCard::lastModified($vcard)->format('U')
+		'lastmodified' => $lastmodified->format('U')
 	)
 ));
diff --git a/apps/contacts/ajax/contact/details.php b/apps/contacts/ajax/contact/details.php
index c22f18937d7..5bf337e645e 100644
--- a/apps/contacts/ajax/contact/details.php
+++ b/apps/contacts/ajax/contact/details.php
@@ -50,9 +50,13 @@ if(isset($details['PHOTO'])) {
 } else {
 	$details['PHOTO'] = false;
 }
+$lastmodified = OC_Contacts_App::lastModified($vcard);
+if(!$lastmodified) {
+	$lastmodified = new DateTime();
+}
 $details['id'] = $id;
 $details['displayname'] = $card['fullname'];
 $details['addressbookid'] = $card['addressbookid'];
-$details['lastmodified'] = OC_Contacts_App::lastModified($vcard)->format('U');
+$details['lastmodified'] = $lastmodified->format('U');
 OC_Contacts_App::setLastModifiedHeader($vcard);
 OCP\JSON::success(array('data' => $details));
diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
index 9eee55583a4..6cb5b59525c 100644
--- a/apps/contacts/appinfo/remote.php
+++ b/apps/contacts/appinfo/remote.php
@@ -36,12 +36,15 @@ $principalBackend = new OC_Connector_Sabre_Principal();
 $carddavBackend   = new OC_Connector_Sabre_CardDAV();
 
 // Root nodes
-$collection = new Sabre_CalDAV_Principal_Collection($principalBackend); 
-$collection->disableListing = true; // Disable listening
+$Sabre_CalDAV_Principal_Collection = new Sabre_CalDAV_Principal_Collection($principalBackend); 
+$Sabre_CalDAV_Principal_Collection->disableListing = true; // Disable listening
+
+$Sabre_CardDAV_AddressBookRoot = new Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend);
+$Sabre_CardDAV_AddressBookRoot->disableListing = true; // Disable listening
 
 $nodes = array( 
-	$collection, 
-	new Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend),
+	$Sabre_CalDAV_Principal_Collection, 
+	$Sabre_CardDAV_AddressBookRoot,
 	);
 
 // Fire up server
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 67bfa9847ee..35637de050d 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1220,7 +1220,7 @@ OC.Contacts={
 		},
 		loadPhoto:function(){
 			var self = this;
-			var refreshstr = ''; //'&refresh='+Math.random();
+			var refreshstr = '&refresh='+Math.random();
 			$('#phototools li a').tipsy('hide');
 			var wrapper = $('#contacts_details_photo_wrapper');
 			wrapper.addClass('loading').addClass('wait');
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index 925d78b6844..72550522d5b 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -59,6 +59,7 @@
 "Edit name" => "Edita el nom",
 "No files selected for upload." => "No s'han seleccionat fitxers per a la pujada.",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "El fitxer que intenteu pujar excedeix la mida màxima de pujada en aquest servidor.",
+"Error loading profile picture." => "Error en carregar la imatge de perfil.",
 "Select type" => "Seleccioneu un tipus",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Heu marcat eliminar alguns contactes, però encara no s'han eliminat. Espereu mentre s'esborren.",
 "Result: " => "Resultat: ",
@@ -108,6 +109,8 @@
 "Next contact in list" => "Següent contacte de la llista",
 "Previous contact in list" => "Contacte anterior de la llista",
 "Expand/collapse current addressbook" => "Expandeix/col·lapsa la llibreta d'adreces",
+"Next addressbook" => "Llibreta d'adreces següent",
+"Previous addressbook" => "Llibreta d'adreces anterior",
 "Actions" => "Accions",
 "Refresh contacts list" => "Carrega de nou la llista de contactes",
 "Add new contact" => "Afegeix un contacte nou",
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index 5fa5bb4f9dd..a47b61d5075 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -2,13 +2,13 @@
 "Error (de)activating addressbook." => "(De-)Aktivierung des Adressbuches fehlgeschlagen",
 "id is not set." => "ID ist nicht angegeben.",
 "Cannot update addressbook with an empty name." => "Adressbuch kann nicht mir leeren Namen aktualisiert werden.",
-"Error updating addressbook." => "Adressbuch aktualisieren fehlgeschlagen",
+"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.",
 "No address books found." => "Keine Adressbücher gefunden.",
 "No contacts found." => "Keine Kontakte gefunden.",
-"There was an error adding the contact." => "Erstellen des Kontakts fehlgeschlagen",
+"There was an error adding the contact." => "Erstellen des Kontakts fehlgeschlagen.",
 "element name is not set." => "Kein Name für das Element angegeben.",
 "Could not parse contact: " => "Konnte folgenden Kontakt nicht verarbeiten:",
 "Cannot add empty property." => "Feld darf nicht leer sein.",
@@ -16,7 +16,7 @@
 "Trying to add duplicate property: " => "Versuche, doppelte Eigenschaft hinzuzufügen: ",
 "Error adding contact property: " => "Fehler beim Hinzufügen der Kontakteigenschaft:",
 "Information about vCard is incorrect. Please reload the page." => "Die Information der vCard ist fehlerhaft. Bitte aktualisiere die Seite.",
-"Error deleting contact property." => "Kontakteigenschaft löschen fehlgeschlagen",
+"Error deleting contact property." => "Kontakteigenschaft löschen fehlgeschlagen.",
 "Missing ID" => "Fehlende ID",
 "Error parsing VCard for ID: \"" => "Fehler beim Einlesen der VCard für die ID: \"",
 "checksum is not set." => "Keine Prüfsumme angegeben.",
@@ -33,15 +33,15 @@
 "Error loading image." => "Fehler beim Laden des Bildes.",
 "Error getting contact object." => "Fehler beim Abruf des Kontakt-Objektes.",
 "Error getting PHOTO property." => "Fehler beim Abrufen der PHOTO Eigenschaft.",
-"Error saving contact." => "Fehler beim Speichern des Kontaktes",
+"Error saving contact." => "Fehler beim Speichern des Kontaktes.",
 "Error resizing image" => "Fehler bei der Größenänderung des Bildes",
 "Error cropping image" => "Fehler beim Zuschneiden des Bildes",
 "Error creating temporary image" => "Fehler beim erstellen des temporären Bildes",
 "Error finding image: " => "Fehler beim Suchen des Bildes: ",
 "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",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Datei größer als die MAX_FILE_SIZE Direktive erlaubt, die im HTML Formular spezifiziert ist",
+"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",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Datei größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML Formular spezifiziert ist",
 "The uploaded file was only partially uploaded" => "Datei konnte nur teilweise übertragen werden",
 "No file was uploaded" => "Keine Datei konnte übertragen werden.",
 "Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
@@ -50,17 +50,18 @@
 "No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
 "Contacts" => "Kontakte",
 "Sorry, this functionality has not been implemented yet" => "Diese Funktion steht leider noch nicht zur Verfügung",
-"Not implemented" => "Nicht Verfügbar",
+"Not implemented" => "Nicht verfügbar",
 "Couldn't get a valid address." => "Konnte keine gültige Adresse abrufen",
 "Error" => "Fehler",
-"This property has to be non-empty." => "Dieses Feld darf nicht Leer sein.",
+"This property has to be non-empty." => "Dieses Feld darf nicht leer sein.",
 "Couldn't serialize elements." => "Konnte Elemente nicht serialisieren",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' wurde ohne Argumente aufgerufen, bitte Melde dies auf bugs.owncloud.org",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' wurde ohne Argumente aufgerufen, bitte melde dies auf bugs.owncloud.org",
 "Edit name" => "Name ändern",
 "No files selected for upload." => "Keine Datei(en) zum Hochladen ausgewählt",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei, die Sie versuchen hochzuladen, überschreitet die maximale Größe für Datei-Uploads auf diesem Server.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei, die du hochladen willst, überschreitet die maximale Größe für Datei-Uploads auf diesem Server.",
+"Error loading profile picture." => "Fehler beim Laden des Profilbildes.",
 "Select type" => "Wähle Typ",
-"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten ...",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten.",
 "Result: " => "Ergebnis: ",
 " imported, " => " importiert, ",
 " failed." => " fehlgeschlagen.",
@@ -119,7 +120,7 @@
 "Delete current photo" => "Derzeitiges Foto löschen",
 "Edit current photo" => "Foto ändern",
 "Upload new photo" => "Neues Foto hochladen",
-"Select photo from ownCloud" => "Foto aus ownCloud auswählen",
+"Select photo from ownCloud" => "Foto aus der 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",
@@ -134,7 +135,7 @@
 "Edit groups" => "Gruppen editieren",
 "Preferred" => "Bevorzugt",
 "Please specify a valid email address." => "Bitte eine gültige E-Mail-Adresse angeben.",
-"Enter email address" => "E-Mail-Adresse angeben.",
+"Enter email address" => "E-Mail-Adresse angeben",
 "Mail to address" => "E-Mail an diese Adresse schreiben",
 "Delete email address" => "E-Mail-Adresse löschen",
 "Enter phone number" => "Telefonnummer angeben",
@@ -194,7 +195,7 @@
 "Enter description" => "Beschreibung eingeben",
 "CardDAV syncing addresses" => "CardDAV Sync-Adressen",
 "more info" => "mehr Info",
-"Primary address (Kontact et al)" => "primäre Adresse (für Kontact o.ä. Programme)",
+"Primary address (Kontact et al)" => "primäre Adresse (für Kontakt o.ä. Programme)",
 "iOS/OS X" => "iOS/OS X",
 "Show CardDav link" => "CardDav-Link anzeigen",
 "Show read-only VCF link" => "Schreibgeschützten VCF-Link anzeigen",
diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php
index 29ac52b1fe7..33c0106d5a4 100644
--- a/apps/contacts/l10n/eo.php
+++ b/apps/contacts/l10n/eo.php
@@ -39,6 +39,8 @@
 "Error finding image: " => "Eraro dum serĉo de bildo: ",
 "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 exceeds the upload_max_filesize directive in php.ini" => "La alŝutita dosiero transpasas la preskribon upload_max_filesize en php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "La alŝutita dosiero transpasas la preskribon MAX_FILE_SIZE kiu specifiĝis en la HTML-formularo",
 "The uploaded file was only partially uploaded" => "la alŝutita dosiero nur parte alŝutiĝis",
 "No file was uploaded" => "Neniu dosiero alŝutiĝis.",
 "Missing a temporary folder" => "Mankas provizora dosierujo.",
@@ -53,6 +55,7 @@
 "This property has to be non-empty." => "Ĉi tiu propraĵo devas ne esti malplena.",
 "Edit name" => "Redakti nomon",
 "No files selected for upload." => "Neniu dosiero elektita por alŝuto.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "La dosiero, kiun vi provas alŝuti, transpasas la maksimuman grandon por dosieraj alŝutoj en ĉi tiu servilo.",
 "Select type" => "Elektu tipon",
 "Result: " => "Rezulto: ",
 " imported, " => " enportoj, ",
@@ -76,7 +79,9 @@
 "Internet" => "Interreto",
 "Birthday" => "Naskiĝotago",
 "Business" => "Negoco",
+"Call" => "Voko",
 "Clients" => "Klientoj",
+"Holidays" => "Ferioj",
 "Ideas" => "Ideoj",
 "Meeting" => "Kunveno",
 "Other" => "Alia",
@@ -94,7 +99,10 @@
 "Navigation" => "Navigado",
 "Next contact in list" => "Sekva kontakto en la listo",
 "Previous contact in list" => "Malsekva kontakto en la listo",
+"Next addressbook" => "Sekva adresaro",
+"Previous addressbook" => "Malsekva adresaro",
 "Actions" => "Agoj",
+"Refresh contacts list" => "Refreŝigi la kontaktoliston",
 "Add new contact" => "Aldoni novan kontakton",
 "Add new addressbook" => "Aldoni novan adresaron",
 "Delete current contact" => "Forigi la nunan kontakton",
diff --git a/apps/contacts/l10n/es.php b/apps/contacts/l10n/es.php
index e9ee24d5297..ebc38dfb3ee 100644
--- a/apps/contacts/l10n/es.php
+++ b/apps/contacts/l10n/es.php
@@ -78,12 +78,32 @@
 "Pager" => "Localizador",
 "Internet" => "Internet",
 "Birthday" => "Cumpleaños",
+"Business" => "Negocio",
+"Call" => "Llamada",
+"Clients" => "Clientes",
+"Holidays" => "Vacaciones",
+"Ideas" => "Ideas",
+"Journey" => "Jornada",
+"Meeting" => "Reunión",
+"Other" => "Otro",
+"Personal" => "Personal",
+"Projects" => "Proyectos",
+"Questions" => "Preguntas",
 "{name}'s Birthday" => "Cumpleaños de {name}",
 "Contact" => "Contacto",
 "Add Contact" => "Añadir contacto",
 "Import" => "Importar",
+"Settings" => "Configuración",
 "Addressbooks" => "Libretas de direcciones",
 "Close" => "Cierra.",
+"Keyboard shortcuts" => "Atajos de teclado",
+"Navigation" => "Navegación",
+"Next contact in list" => "Siguiente contacto en la lista",
+"Previous contact in list" => "Anterior contacto en la lista",
+"Actions" => "Acciones",
+"Refresh contacts list" => "Refrescar la lista de contactos",
+"Add new contact" => "Añadir un nuevo contacto",
+"Delete current contact" => "Eliminar contacto actual",
 "Drop photo to upload" => "Suelta una foto para subirla",
 "Delete current photo" => "Eliminar fotografía actual",
 "Edit current photo" => "Editar fotografía actual",
@@ -94,6 +114,7 @@
 "Delete" => "Borrar",
 "Nickname" => "Alias",
 "Enter nickname" => "Introduce un alias",
+"Web site" => "Sitio Web",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Grupos",
 "Separate groups with commas" => "Separa los grupos con comas",
@@ -121,6 +142,7 @@
 "City" => "Ciudad",
 "Region" => "Región",
 "Zipcode" => "Código postal",
+"Postal code" => "Código postal",
 "Country" => "País",
 "Addressbook" => "Libreta de direcciones",
 "Hon. prefixes" => "Prefijos honoríficos",
@@ -150,6 +172,8 @@
 "You have no contacts in your addressbook." => "No hay contactos en tu agenda.",
 "Add contact" => "Añadir contacto",
 "Configure addressbooks" => "Configurar agenda",
+"Enter name" => "Introducir nombre",
+"Enter description" => "Introducir descripción",
 "CardDAV syncing addresses" => "Sincronizando direcciones",
 "more info" => "más información",
 "Primary address (Kontact et al)" => "Dirección primaria (Kontact et al)",
@@ -157,6 +181,9 @@
 "Download" => "Descargar",
 "Edit" => "Editar",
 "New Address Book" => "Nueva libreta de direcciones",
+"Name" => "Nombre",
+"Description" => "Descripción",
 "Save" => "Guardar",
-"Cancel" => "Cancelar"
+"Cancel" => "Cancelar",
+"More..." => "Más..."
 );
diff --git a/apps/contacts/l10n/fi_FI.php b/apps/contacts/l10n/fi_FI.php
index 6aab4ed3472..069b08144e5 100644
--- a/apps/contacts/l10n/fi_FI.php
+++ b/apps/contacts/l10n/fi_FI.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Error updating addressbook." => "Virhe päivitettäessä osoitekirjaa.",
+"Error setting checksum." => "Virhe asettaessa tarkistussummaa.",
 "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.",
@@ -11,6 +12,7 @@
 "Error parsing VCard for ID: \"" => "Virhe jäsennettäessä vCardia tunnisteelle: \"",
 "Error updating contact property." => "Virhe päivitettäessä yhteystiedon ominaisuutta.",
 "Error saving temporary file." => "Virhe tallennettaessa tilapäistiedostoa.",
+"No photo path was submitted." => "Kuvan polkua ei annettu.",
 "File doesn't exist:" => "Tiedostoa ei ole olemassa:",
 "Error loading image." => "Virhe kuvaa ladatessa.",
 "Error saving contact." => "Virhe yhteystietoa tallennettaessa.",
@@ -22,11 +24,14 @@
 "The uploaded file was only partially uploaded" => "Lähetetty tiedosto lähetettiin vain osittain",
 "No file was uploaded" => "Tiedostoa ei lähetetty",
 "Missing a temporary folder" => "Tilapäiskansio puuttuu",
+"Couldn't save temporary image: " => "Väliaikaiskuvan tallennus epäonnistui:",
+"Couldn't load temporary image: " => "Väliaikaiskuvan lataus epäonnistui:",
 "No file was uploaded. Unknown error" => "Tiedostoa ei lähetetty. Tuntematon virhe",
 "Contacts" => "Yhteystiedot",
 "Error" => "Virhe",
 "Edit name" => "Muokkaa nimeä",
 "No files selected for upload." => "Tiedostoja ei ole valittu lähetettäväksi.",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Jotkin yhteystiedot on merkitty poistettaviksi, mutta niitä ei ole vielä poistettu. Odota hetki, että kyseiset yhteystiedot poistetaan.",
 "Result: " => "Tulos: ",
 " imported, " => " tuotu, ",
 " failed." => " epäonnistui.",
@@ -61,6 +66,8 @@
 "Keyboard shortcuts" => "Pikanäppäimet",
 "Next contact in list" => "Seuraava yhteystieto luettelossa",
 "Previous contact in list" => "Edellinen yhteystieto luettelossa",
+"Next addressbook" => "Seuraava osoitekirja",
+"Previous addressbook" => "Edellinen osoitekirja",
 "Actions" => "Toiminnot",
 "Refresh contacts list" => "Päivitä yhteystietoluettelo",
 "Add new contact" => "Lisää uusi yhteystieto",
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index 9b4822bd976..93299380d22 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -60,6 +60,7 @@
 "No files selected for upload." => "Aucun fichiers choisis pour être chargés",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "Le fichier que vous tenter de charger dépasse la taille maximum de fichier autorisé sur ce serveur.",
 "Select type" => "Sélectionner un type",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Certains contacts sont marqués pour être supprimés mais sont encore présents, veuillez attendre que l'opération se termine.",
 "Result: " => "Résultat :",
 " imported, " => "importé,",
 " failed." => "échoué.",
@@ -196,6 +197,7 @@
 "Primary address (Kontact et al)" => "Adresse principale",
 "iOS/OS X" => "iOS/OS X",
 "Show CardDav link" => "Afficher le lien CardDav",
+"Show read-only VCF link" => "Afficher les liens VCF en lecture seule",
 "Download" => "Télécharger",
 "Edit" => "Modifier",
 "New Address Book" => "Nouveau Carnet d'adresses",
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index 31f950ff80c..e1af39fe91a 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -59,6 +59,7 @@
 "Edit name" => "Modifica il nome",
 "No files selected for upload." => "Nessun file selezionato per l'invio",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "Il file che stai cercando di inviare supera la dimensione massima per l'invio dei file su questo server.",
+"Error loading profile picture." => "Errore durante il caricamento dell'immagine di profilo.",
 "Select type" => "Seleziona il tipo",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Alcuni contatti sono marcati per l'eliminazione, ma non sono stati ancora rimossi. Attendi fino al completamento dell'operazione.",
 "Result: " => "Risultato: ",
@@ -108,6 +109,8 @@
 "Next contact in list" => "Contatto successivo in elenco",
 "Previous contact in list" => "Contatto precedente in elenco",
 "Expand/collapse current addressbook" => "Espandi/Contrai la rubrica corrente",
+"Next addressbook" => "Rubrica successiva",
+"Previous addressbook" => "Rubrica precedente",
 "Actions" => "Azioni",
 "Refresh contacts list" => "Aggiorna l'elenco dei contatti",
 "Add new contact" => "Aggiungi un nuovo contatto",
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index 074a725b48b..4f7800e1dbc 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -10,15 +10,18 @@
 "No contacts found." => "連絡先が見つかりません。",
 "There was an error adding the contact." => "連絡先の追加でエラーが発生しました。",
 "element name is not set." => "要素名が設定されていません。",
+"Could not parse contact: " => "連絡先を解析できませんでした:",
 "Cannot add empty property." => "項目の新規追加に失敗しました。",
 "At least one of the address fields has to be filled out." => "住所の項目のうち１つは入力して下さい。",
 "Trying to add duplicate property: " => "重複する属性を追加: ",
 "Error adding contact property: " => "コンタクト属性の追加エラー: ",
 "Information about vCard is incorrect. Please reload the page." => "vCardの情報に誤りがあります。ページをリロードして下さい。",
 "Error deleting contact property." => "連絡先の削除に失敗しました。",
+"Missing ID" => "IDが見つかりません",
 "Error parsing VCard for ID: \"" => "VCardからIDの抽出エラー: \"",
 "checksum is not set." => "チェックサムが設定されていません。",
 "Information about vCard is incorrect. Please reload the page: " => "vCardの情報が正しくありません。ページを再読み込みしてください: ",
+"Something went FUBAR. " => "何かがFUBARへ移動しました。",
 "Error updating contact property." => "連絡先の更新に失敗しました。",
 "No contact ID was submitted." => "連絡先IDは登録されませんでした。",
 "Error reading contact photo." => "連絡先写真の読み込みエラー。",
@@ -60,6 +63,8 @@
 "Result: " => "結果: ",
 " imported, " => " をインポート、 ",
 " failed." => " は失敗しました。",
+"Displayname cannot be empty." => "表示名は空にできません。",
+"Addressbook not found: " => "連絡先が見つかりません:",
 "This is not your addressbook." => "これはあなたの電話帳ではありません。",
 "Contact could not be found." => "連絡先を見つける事ができません。",
 "Address" => "住所",
@@ -78,6 +83,7 @@
 "Internet" => "インターネット",
 "Birthday" => "誕生日",
 "Business" => "ビジネス",
+"Call" => "電話",
 "Clients" => "顧客",
 "Deliverer" => "運送会社",
 "Holidays" => "休日",
@@ -100,6 +106,11 @@
 "Navigation" => "ナビゲーション",
 "Next contact in list" => "リスト内の次のコンタクト",
 "Previous contact in list" => "リスト内の前のコンタクト",
+"Expand/collapse current addressbook" => "現在の連絡帳を展開する／折りたたむ",
+"Next addressbook" => "次の連絡先",
+"Previous addressbook" => "前の連絡先",
+"Actions" => "アクション",
+"Refresh contacts list" => "連絡先リストを再読込する",
 "Add new contact" => "新しいコンタクトを追加",
 "Add new addressbook" => "新しいアドレスブックを追加",
 "Delete current contact" => "現在のコンタクトを削除",
@@ -114,6 +125,7 @@
 "Enter nickname" => "ニックネームを入力",
 "Web site" => "ウェブサイト",
 "http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Webサイトへ移動",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "グループ",
 "Separate groups with commas" => "コンマでグループを分割",
@@ -137,9 +149,13 @@
 "Edit address" => "住所を編集",
 "Type" => "種類",
 "PO Box" => "私書箱",
-"Extended" => "番地2",
+"Street address" => "住所1",
+"Street and number" => "番地",
+"Extended" => "住所2",
+"Apartment number etc." => "アパート名等",
 "City" => "都市",
 "Region" => "都道府県",
+"E.g. state or province" => "例：東京都、大阪府",
 "Zipcode" => "郵便番号",
 "Postal code" => "郵便番号",
 "Country" => "国名",
@@ -170,14 +186,21 @@
 "You have no contacts in your addressbook." => "アドレスブックに連絡先が登録されていません。",
 "Add contact" => "連絡先を追加",
 "Configure addressbooks" => "アドレス帳を設定",
+"Select Address Books" => "連絡先を洗濯してください",
 "Enter name" => "名前を入力",
+"Enter description" => "説明を入力してください",
 "CardDAV syncing addresses" => "CardDAV同期アドレス",
 "more info" => "詳細情報",
 "Primary address (Kontact et al)" => "プライマリアドレス（Kontact 他）",
 "iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "CarDavリンクを表示",
+"Show read-only VCF link" => "読み取り専用のVCFリンクを表示",
 "Download" => "ダウンロード",
 "Edit" => "編集",
 "New Address Book" => "新規電話帳",
+"Name" => "名前",
+"Description" => "説明",
 "Save" => "保存",
-"Cancel" => "取り消し"
+"Cancel" => "取り消し",
+"More..." => "もっと..."
 );
diff --git a/apps/contacts/l10n/ms_MY.php b/apps/contacts/l10n/ms_MY.php
index 2fd386f5a81..8153c4d9366 100644
--- a/apps/contacts/l10n/ms_MY.php
+++ b/apps/contacts/l10n/ms_MY.php
@@ -61,6 +61,7 @@
 "Result: " => "Hasil: ",
 " imported, " => " import, ",
 " failed." => " gagal.",
+"Addressbook not found: " => "Buku alamat tidak ditemui:",
 "This is not your addressbook." => "Ini bukan buku alamat anda.",
 "Contact could not be found." => "Hubungan tidak dapat ditemui",
 "Address" => "Alamat",
@@ -78,12 +79,25 @@
 "Pager" => "Alat Kelui",
 "Internet" => "Internet",
 "Birthday" => "Hari lahir",
+"Business" => "Perniagaan",
+"Clients" => "klien",
+"Holidays" => "Hari kelepasan",
+"Ideas" => "Idea",
+"Journey" => "Perjalanan",
+"Jubilee" => "Jubli",
+"Meeting" => "Mesyuarat",
+"Other" => "Lain",
+"Personal" => "Peribadi",
+"Projects" => "Projek",
 "{name}'s Birthday" => "Hari Lahir {name}",
 "Contact" => "Hubungan",
 "Add Contact" => "Tambah kenalan",
 "Import" => "Import",
+"Settings" => "Tetapan",
 "Addressbooks" => "Senarai Buku Alamat",
 "Close" => "Tutup",
+"Next addressbook" => "Buku alamat seterusnya",
+"Previous addressbook" => "Buku alamat sebelumnya",
 "Drop photo to upload" => "Letak foto disini untuk muatnaik",
 "Delete current photo" => "Padam foto semasa",
 "Edit current photo" => "Ubah foto semasa",
@@ -150,6 +164,9 @@
 "You have no contacts in your addressbook." => "Anda tidak mempunyai sebarang kenalan didalam buku alamat.",
 "Add contact" => "Letak kenalan",
 "Configure addressbooks" => "Konfigurasi buku alamat",
+"Select Address Books" => "Pilih Buku Alamat",
+"Enter name" => "Masukkan nama",
+"Enter description" => "Masukkan keterangan",
 "CardDAV syncing addresses" => "alamat selarian CardDAV",
 "more info" => "maklumat lanjut",
 "Primary address (Kontact et al)" => "Alamat utama",
@@ -157,6 +174,9 @@
 "Download" => "Muat naik",
 "Edit" => "Sunting",
 "New Address Book" => "Buku Alamat Baru",
+"Name" => "Nama",
+"Description" => "Keterangan",
 "Save" => "Simpan",
-"Cancel" => "Batal"
+"Cancel" => "Batal",
+"More..." => "Lagi..."
 );
diff --git a/apps/contacts/l10n/th_TH.php b/apps/contacts/l10n/th_TH.php
index 553271d88f6..7a4989986f3 100644
--- a/apps/contacts/l10n/th_TH.php
+++ b/apps/contacts/l10n/th_TH.php
@@ -10,9 +10,11 @@
 "No contacts found." => "ไม่พบข้อมูลการติดต่อที่ต้องการ",
 "There was an error adding the contact." => "เกิดข้อผิดพลาดในการเพิ่มรายชื่อผู้ติดต่อใหม่",
 "element name is not set." => "ยังไม่ได้กำหนดชื่อ",
+"Could not parse contact: " => "ไม่สามารถแจกแจงรายชื่อผู้ติดต่อได้",
 "Cannot add empty property." => "ไม่สามารถเพิ่มรายละเอียดที่ไม่มีข้อมูลได้",
 "At least one of the address fields has to be filled out." => "อย่างน้อยที่สุดช่องข้อมูลที่อยู่จะต้องถูกกรอกลงไป",
 "Trying to add duplicate property: " => "พยายามที่จะเพิ่มทรัพยากรที่ซ้ำซ้อนกัน: ",
+"Error adding contact property: " => "เกิดข้อผิดพลาดในการเพิ่มคุณสมบัติข้อมูลผู้ติดต่อ",
 "Information about vCard is incorrect. Please reload the page." => "ข้อมูลเกี่ยวกับ vCard ไม่ถูกต้อง กรุณาโหลดหน้าเวปใหม่อีกครั้ง",
 "Error deleting contact property." => "เกิดข้อผิดพลาดในการลบรายละเอียดการติดต่อ",
 "Missing ID" => "รหัสสูญหาย",
@@ -57,10 +59,14 @@
 "Edit name" => "แก้ไขชื่อ",
 "No files selected for upload." => "ยังไม่ได้เลือกไฟล์ำสำหรับอัพโหลด",
 "The file you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณกำลังพยายามที่จะอัพโหลดมีขนาดเกินจำนวนสูงสุดที่สามารถอัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
+"Error loading profile picture." => "เกิดข้อผิดพลาดในการโหลดรูปภาพประจำตัว",
 "Select type" => "เลือกชนิด",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "ข้อมูลผู้ติดต่อบางรายการได้ถูกทำเครื่องหมายสำหรับลบทิ้งเอาไว้, แต่ยังไม่ได้ถูกลบทิ้ง, กรุณารอให้รายการดังกล่าวถูกลบทิ้งเสียก่อน",
 "Result: " => "ผลลัพธ์: ",
 " imported, " => " นำเข้าข้อมูลแล้ว, ",
 " failed." => " ล้มเหลว.",
+"Displayname cannot be empty." => "ชื่อที่ใช้แสดงไม่สามารถเว้นว่างได้",
+"Addressbook not found: " => "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ",
 "This is not your addressbook." => "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ",
 "Contact could not be found." => "ไม่พบข้อมูลการติดต่อ",
 "Address" => "ที่อยู่",
@@ -78,12 +84,38 @@
 "Pager" => "เพจเจอร์",
 "Internet" => "อินเทอร์เน็ต",
 "Birthday" => "วันเกิด",
+"Business" => "ธุรกิจ",
+"Call" => "โทร",
+"Clients" => "ลูกค้า",
+"Deliverer" => "ผู้จัดส่ง",
+"Holidays" => "วันหยุด",
+"Ideas" => "ไอเดีย",
+"Journey" => "การเดินทาง",
+"Jubilee" => "งานเฉลิมฉลอง",
+"Meeting" => "ประชุม",
+"Other" => "อื่นๆ",
+"Personal" => "ส่วนตัว",
+"Projects" => "โปรเจค",
+"Questions" => "คำถาม",
 "{name}'s Birthday" => "วันเกิดของ {name}",
 "Contact" => "ข้อมูลการติดต่อ",
 "Add Contact" => "เพิ่มรายชื่อผู้ติดต่อใหม่",
 "Import" => "นำเข้า",
+"Settings" => "ตั้งค่า",
 "Addressbooks" => "สมุดบันทึกที่อยู่",
 "Close" => "ปิด",
+"Keyboard shortcuts" => "ปุ่มลัด",
+"Navigation" => "ระบบเมนู",
+"Next contact in list" => "ข้อมูลผู้ติดต่อถัดไปในรายการ",
+"Previous contact in list" => "ข้อมูลผู้ติดต่อก่อนหน้าในรายการ",
+"Expand/collapse current addressbook" => "ขยาย/ย่อ สมุดบันทึกที่อยู่ปัจจุบัน",
+"Next addressbook" => "สมุดบันทึกที่อยู่ถัดไป",
+"Previous addressbook" => "สมุดบันทึกที่อยู่ก่อนหน้า",
+"Actions" => "การกระทำ",
+"Refresh contacts list" => "รีเฟรชรายชื่อผู้ติดต่อใหม่",
+"Add new contact" => "เพิ่มข้อมูลผู้ติดต่อใหม่",
+"Add new addressbook" => "เพิ่มสมุดบันทึกที่อยู่ใหม่",
+"Delete current contact" => "ลบข้อมูลผู้ติดต่อปัจจุบัน",
 "Drop photo to upload" => "วางรูปภาพที่ต้องการอัพโหลด",
 "Delete current photo" => "ลบรูปภาพปัจจุบัน",
 "Edit current photo" => "แก้ไขรูปภาพปัจจุบัน",
@@ -94,6 +126,9 @@
 "Delete" => "ลบ",
 "Nickname" => "ชื่อเล่น",
 "Enter nickname" => "กรอกชื่อเล่น",
+"Web site" => "เว็บไซต์",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "ไปที่เว็บไซต์",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "กลุ่ม",
 "Separate groups with commas" => "คั่นระหว่างรายชื่อกลุ่มด้วยเครื่องหมายจุลภาีคหรือคอมม่า",
@@ -117,10 +152,15 @@
 "Edit address" => "แก้ไขที่อยู่",
 "Type" => "ประเภท",
 "PO Box" => "ตู้ ปณ.",
+"Street address" => "ที่อยู่",
+"Street and number" => "ถนนและหมายเลข",
 "Extended" => "เพิ่ม",
+"Apartment number etc." => "หมายเลขอพาร์ทเมนต์ ฯลฯ",
 "City" => "เมือง",
 "Region" => "ภูมิภาค",
+"E.g. state or province" => "เช่น รัฐ หรือ จังหวัด",
 "Zipcode" => "รหัสไปรษณีย์",
+"Postal code" => "รหัสไปรษณีย์",
 "Country" => "ประเทศ",
 "Addressbook" => "สมุดบันทึกที่อยู่",
 "Hon. prefixes" => "คำนำหน้าชื่อคนรัก",
@@ -150,13 +190,21 @@
 "You have no contacts in your addressbook." => "คุณยังไม่มีข้อมูลการติดต่อใดๆในสมุดบันทึกที่อยู่ของคุณ",
 "Add contact" => "เพิ่มชื่อผู้ติดต่อ",
 "Configure addressbooks" => "กำหนดค่าสมุดบันทึกที่อยู่",
+"Select Address Books" => "เลือกสมุดบันทึกที่อยู่",
+"Enter name" => "กรอกชื่อ",
+"Enter description" => "กรอกคำอธิบาย",
 "CardDAV syncing addresses" => "ที่อยู่ที่ใช้เชื่อมข้อมูลกับ CardDAV",
 "more info" => "ข้อมูลเพิ่มเติม",
 "Primary address (Kontact et al)" => "ที่อยู่หลัก (สำหรับติดต่อ)",
 "iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "แสดงลิงก์ CardDav",
+"Show read-only VCF link" => "แสดงลิงก์ VCF สำหรับอ่านเท่านั้น",
 "Download" => "ดาวน์โหลด",
 "Edit" => "แก้ไข",
 "New Address Book" => "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่",
+"Name" => "ชื่อ",
+"Description" => "คำอธิบาย",
 "Save" => "บันทึก",
-"Cancel" => "ยกเลิก"
+"Cancel" => "ยกเลิก",
+"More..." => "เพิ่มเติม..."
 );
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 024b1d150f8..744381026ab 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -13,9 +13,9 @@
 	<div id="bottomcontrols">
 			<button class="svg" id="contacts_newcontact" title="<?php echo $l->t('Add Contact'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('contacts', 'contact-new.svg'); ?>" alt="<?php echo $l->t('Add Contact'); ?>" /></button>
 			<button class="svg import tip" title="<?php echo $l->t('Import'); ?>">
-				<img class="svg" src="core/img/actions/upload.svg" alt="<?php echo $l->t('Import'); ?>" />
+				<img class="svg" src="<?php echo OCP\Util::imagePath('core', 'actions/upload.svg') ?>" alt="<?php echo $l->t('Import'); ?>" />
 			</button>
-			<button class="svg settings tip" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="core/img/actions/settings.svg" alt="<?php echo $l->t('Addressbooks'); ?>" /></button>
+			<button class="svg settings tip" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('core', 'actions/settings.svg') ?>" alt="<?php echo $l->t('Addressbooks'); ?>" /></button>
 		<form id="import_upload_form" action="<?php echo OCP\Util::linkTo('contacts', 'ajax/uploadimport.php'); ?>" method="post" enctype="multipart/form-data" target="import_upload_target">
 			<input class="float" id="import_upload_start" type="file" accept="text/directory,text/vcard,text/x-vcard" name="importfile" />
 			<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
@@ -69,6 +69,6 @@
 <div id="dialog_holder"></div>
 <!-- End of Dialogs -->
 <menu type="context" id="addressbookmenu">
-	<menuitem label="Delete" icon="core/img/actions/delete.svg" onclick="alert('Really? ' + $(this).attr('data-id'))"></menuitem>
-	<menuitem label="Rename" icon="core/img/actions/rename.svg" onclick="alert('Can\'t do that')"></menuitem>
+	<menuitem label="Delete" icon="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg') ?>" onclick="alert('Really? ' + $(this).attr('data-id'))"></menuitem>
+	<menuitem label="Rename" icon="<?php echo OCP\Util::imagePath('core', 'actions/rename.svg') ?>" onclick="alert('Can\'t do that')"></menuitem>
 </menu>
diff --git a/apps/contacts/templates/part.selectaddressbook.php b/apps/contacts/templates/part.selectaddressbook.php
index c54ddaf2e67..812a3b891ff 100644
--- a/apps/contacts/templates/part.selectaddressbook.php
+++ b/apps/contacts/templates/part.selectaddressbook.php
@@ -1,4 +1,11 @@
 <div id="selectaddressbook_dialog" title="<?php echo $l->t("Select Address Books"); ?>">
+<script type="text/javascript">
+$(document).ready(function() {
+	$('input.name,input.desc').on('focus', function(e) {
+		$('#book_new').prop('checked', true);
+	});
+});
+</script>
 <form>
 <table style="width: 100%">
 	<?php foreach($_['addressbooks'] as $idx => $addressbook) { ?>
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 0fd9e9a06c5..99ab3c124b4 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -9,6 +9,11 @@
 "Files" => "Datoteke",
 "Unshare" => "Vzemi iz souporabe",
 "Delete" => "Izbriši",
+"already exists" => "že obstaja",
+"replace" => "nadomesti",
+"cancel" => "ekliči",
+"replaced" => "nadomeščen",
+"with" => "z",
 "undo" => "razveljavi",
 "deleted" => "izbrisano",
 "generating ZIP-file, it may take some time." => "Ustvarjam ZIP datoteko. To lahko traja nekaj časa.",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 4299c31a45a..03a50fd711e 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -7,7 +7,15 @@
 "Missing a temporary folder" => "แฟ้มเอกสารชั่วคราวเกิดการสูญหาย",
 "Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
 "Files" => "ไฟล์",
+"Unshare" => "ยกเลิกการแชร์ข้อมูล",
 "Delete" => "ลบ",
+"already exists" => "มีอยู่แล้ว",
+"replace" => "แทนที่",
+"cancel" => "ยกเลิก",
+"replaced" => "แทนที่แล้ว",
+"with" => "กับ",
+"undo" => "เลิกทำ",
+"deleted" => "ลบแล้ว",
 "generating ZIP-file, it may take some time." => "กำลังสร้างไฟล์บีบอัด ZIP อาจใช้เวลาสักครู่",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์",
 "Upload Error" => "เกิดข้อผิดพลาดในการอัพโหลด",
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
new file mode 100644
index 00000000000..2026becc4db
--- /dev/null
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -0,0 +1,52 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "没有任何错误,文件上传成功了",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "上传的文件超过了php.ini指定的upload_max_filesize",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件超过了HTML表单指定的MAX_FILE_SIZE",
+"The uploaded file was only partially uploaded" => "文件只有部分被上传",
+"No file was uploaded" => "没有上传完成的文件",
+"Missing a temporary folder" => "丢失了一个临时文件夹",
+"Failed to write to disk" => "写磁盘失败",
+"Files" => "文件",
+"Unshare" => "未分享的",
+"Delete" => "删除",
+"already exists" => "已经存在了",
+"replace" => "替换",
+"cancel" => "取消",
+"replaced" => "替换过了",
+"with" => "随着",
+"undo" => "撤销",
+"deleted" => "删除",
+"generating ZIP-file, it may take some time." => "正在生成ZIP文件,这可能需要点时间",
+"Unable to upload your file as it is a directory or has 0 bytes" => "不能上传你指定的文件,可能因为它是个文件夹或者大小为0",
+"Upload Error" => "上传错误",
+"Pending" => "Pending",
+"Upload cancelled." => "上传取消了",
+"Invalid name, '/' is not allowed." => "非法文件名,\"/\"是不被许可的",
+"Size" => "大小",
+"Modified" => "修改日期",
+"folder" => "文件夹",
+"folders" => "文件夹",
+"file" => "文件",
+"files" => "文件",
+"File handling" => "文件处理中",
+"Maximum upload size" => "最大上传大小",
+"max. possible: " => "最大可能",
+"Needed for multi-file and folder downloads." => "需要多文件和文件夹下载.",
+"Enable ZIP-download" => "支持ZIP下载",
+"0 is unlimited" => "0是无限的",
+"Maximum input size for ZIP files" => "最大的ZIP文件输入大小",
+"New" => "新建",
+"Text file" => "文本文档",
+"Folder" => "文件夹",
+"From url" => "从URL:",
+"Upload" => "上传",
+"Cancel upload" => "取消上传",
+"Nothing in here. Upload something!" => "这里没有东西.上传点什么!",
+"Name" => "名字",
+"Share" => "分享",
+"Download" => "下载",
+"Upload too large" => "上传的文件太大了",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "你正在试图上传的文件超过了此服务器支持的最大的文件大小.",
+"Files are being scanned, please wait." => "正在扫描文件,请稍候.",
+"Current scanning" => "正在扫描"
+);
diff --git a/apps/files_encryption/l10n/.gitkeep b/apps/files_encryption/l10n/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/apps/files_encryption/l10n/.gitkeep
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
new file mode 100644
index 00000000000..8e087b34620
--- /dev/null
+++ b/apps/files_encryption/l10n/ca.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Encriptatge",
+"Exclude the following file types from encryption" => "Exclou els tipus de fitxers següents de l'encriptatge",
+"None" => "Cap",
+"Enable Encryption" => "Activa l'encriptatge"
+);
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
new file mode 100644
index 00000000000..d486a82322b
--- /dev/null
+++ b/apps/files_encryption/l10n/de.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Verschlüsselung",
+"Exclude the following file types from encryption" => "Die folgenden Dateitypen von der Verschlüsselung ausnehmen",
+"None" => "Keine",
+"Enable Encryption" => "Verschlüsselung aktivieren"
+);
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
new file mode 100644
index 00000000000..c9367d1a312
--- /dev/null
+++ b/apps/files_encryption/l10n/fr.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Chiffrement",
+"Exclude the following file types from encryption" => "Ne pas chiffrer les fichiers dont les types sont les suivants",
+"None" => "Aucun",
+"Enable Encryption" => "Activer le chiffrement"
+);
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
new file mode 100644
index 00000000000..5136b061797
--- /dev/null
+++ b/apps/files_encryption/l10n/it.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Cifratura",
+"Exclude the following file types from encryption" => "Escludi i seguenti tipi di file dalla cifratura",
+"None" => "Nessuna",
+"Enable Encryption" => "Abilita cifratura"
+);
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
new file mode 100644
index 00000000000..5cfc707450e
--- /dev/null
+++ b/apps/files_encryption/l10n/pl.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Szyfrowanie",
+"Exclude the following file types from encryption" => "Wyłącz następujące typy plików z szyfrowania",
+"None" => "Brak",
+"Enable Encryption" => "Włącz szyfrowanie"
+);
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
new file mode 100644
index 00000000000..0a477f83460
--- /dev/null
+++ b/apps/files_encryption/l10n/sv.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Kryptering",
+"Exclude the following file types from encryption" => "Exkludera följande filtyper från kryptering",
+"None" => "Ingen",
+"Enable Encryption" => "Aktivera kryptering"
+);
diff --git a/apps/files_encryption/l10n/th_TH.php b/apps/files_encryption/l10n/th_TH.php
new file mode 100644
index 00000000000..c2685de6e3a
--- /dev/null
+++ b/apps/files_encryption/l10n/th_TH.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "การเข้ารหัส",
+"Exclude the following file types from encryption" => "ไม่ต้องรวมชนิดของไฟล์ดังต่อไปนี้จากการเข้ารหัส",
+"None" => "ไม่ต้อง",
+"Enable Encryption" => "เปิดใช้งานการเข้ารหัส"
+);
diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index d8575c49e34..ca4b1c3ba89 100644
--- a/apps/files_external/css/settings.css
+++ b/apps/files_external/css/settings.css
@@ -1,5 +1,7 @@
 .error { color: #FF3B3B; }
 td.mountPoint, td.backend { width:10em; }
+td.remove>img { visibility:hidden; padding-top:0.8em; }
+tr:hover>td.remove>img { visibility:visible; cursor:pointer; }
 #addMountPoint>td { border:none; }
 #addMountPoint>td.applicable { visibility:hidden; }
 #selectBackend { margin-left:-10px; }
\ No newline at end of file
diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index 08796cbbdc9..92194792f42 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -1,12 +1,15 @@
 $(document).ready(function() {
 
-	$('#externalStorage tbody tr').each(function() {
-		if ($(this).find('.backend').data('class') == 'OC_Filestorage_Dropbox') {
+	$('#externalStorage tbody tr.OC_Filestorage_Dropbox').each(function() {
+		var configured = $(this).find('[data-parameter="configured"]');
+		if ($(configured).val() == 'true') {
+			$(this).find('.configuration input').attr('disabled', 'disabled');
+			$(this).find('.configuration').append('<span id="access" style="padding-left:0.5em;">Access granted</span>');
+		} else {
 			var app_key = $(this).find('.configuration [data-parameter="app_key"]').val();
 			var app_secret = $(this).find('.configuration [data-parameter="app_secret"]').val();
-			if (app_key == '' && app_secret == '') {
-				$(this).find('.configuration').append('<a class="button dropbox">Grant access</a>');
-			} else  {
+			var config = $(this).find('.configuration');
+			if (app_key != '' && app_secret != '') {
 				var pos = window.location.search.indexOf('oauth_token') + 12
 				var token = $(this).find('.configuration [data-parameter="token"]');
 				if (pos != -1 && window.location.search.substr(pos, $(token).val().length) == $(token).val()) {
@@ -17,11 +20,31 @@ $(document).ready(function() {
 							$(token).val(result.access_token);
 							$(token_secret).val(result.access_token_secret);
 							OC.MountConfig.saveStorage(tr);
+							$(tr).find('.configuration input').attr('disabled', 'disabled');
+							$(tr).find('.configuration').append('<span id="access" style="padding-left:0.5em;">Access granted</span>');
 						} else {
 							OC.dialogs.alert(result.data.message, 'Error configuring Dropbox storage');
 						}
 					});
 				}
+			} else if ($(this).find('.mountPoint input').val() != '' && $(config).find('[data-parameter="app_key"]').val() != '' && $(config).find('[data-parameter="app_secret"]').val() != '' && $(this).find('.dropbox').length == 0) {
+				$(this).find('.configuration').append('<a class="button dropbox">Grant access</a>');
+			}
+		}
+	});
+
+	$('#externalStorage tbody tr input').live('keyup', function() {
+		var tr = $(this).parent().parent();
+		if ($(tr).hasClass('OC_Filestorage_Dropbox') && $(tr).find('[data-parameter="configured"]').val() != 'true') {
+			var config = $(tr).find('.configuration');
+			if ($(tr).find('.mountPoint input').val() != '' && $(config).find('[data-parameter="app_key"]').val() != '' && $(config).find('[data-parameter="app_secret"]').val() != '') {
+				if ($(tr).find('.dropbox').length == 0) {
+					$(config).append('<a class="button dropbox">Grant access</a>');
+				} else {
+					$(tr).find('.dropbox').show();
+				}
+			} else if ($(tr).find('.dropbox').length > 0) {
+				$(tr).find('.dropbox').hide();
 			}
 		}
 	});
@@ -32,14 +55,19 @@ $(document).ready(function() {
 		var app_secret = $(this).parent().find('[data-parameter="app_secret"]').val();
 		if (app_key != '' && app_secret != '') {
 			var tr = $(this).parent().parent();
+			var configured = $(this).parent().find('[data-parameter="configured"]');
 			var token = $(this).parent().find('[data-parameter="token"]');
 			var token_secret = $(this).parent().find('[data-parameter="token_secret"]');
 			$.post(OC.filePath('files_external', 'ajax', 'dropbox.php'), { step: 1, app_key: app_key, app_secret: app_secret, callback: window.location.href }, function(result) {
 				if (result && result.status == 'success') {
+					$(configured).val('false');
 					$(token).val(result.data.request_token);
 					$(token_secret).val(result.data.request_token_secret);
-					OC.MountConfig.saveStorage(tr);
-					window.location = result.data.url;
+					if (OC.MountConfig.saveStorage(tr)) {
+						window.location = result.data.url;
+					} else {
+						OC.dialogs.alert('Fill out all required fields', 'Error configuring Dropbox storage');
+					}
 				} else {
 					OC.dialogs.alert(result.data.message, 'Error configuring Dropbox storage');
 				}
diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
index 55042194c7d..7c62297df4d 100644
--- a/apps/files_external/js/google.js
+++ b/apps/files_external/js/google.js
@@ -1,47 +1,76 @@
 $(document).ready(function() {
-	
-	$('#externalStorage tbody tr').each(function() {
-		if ($(this).find('.backend').data('class') == 'OC_Filestorage_Google') {
+
+	$('#externalStorage tbody tr.OC_Filestorage_Google').each(function() {
+		var configured = $(this).find('[data-parameter="configured"]');
+		if ($(configured).val() == 'true') {
+			$(this).find('.configuration').append('<span id="access" style="padding-left:0.5em;">Access granted</span>');
+		} else {
 			var token = $(this).find('[data-parameter="token"]');
 			var token_secret = $(this).find('[data-parameter="token_secret"]');
-			if ($(token).val() == '' && $(token).val() == '') {
-				$(this).find('.configuration').append('<a class="button google">Grant access</a>');
-			} else  {
-				var params = {};
-				window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m, key, value) {
-					params[key] = value;
+			var params = {};
+			window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m, key, value) {
+				params[key] = value;
+			});
+			if (params['oauth_token'] !== undefined && params['oauth_verifier'] !== undefined && decodeURIComponent(params['oauth_token']) == $(token).val()) {
+				var tr = $(this);
+				$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 2, oauth_verifier: params['oauth_verifier'], request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) {
+					if (result && result.status == 'success') {
+						$(token).val(result.access_token);
+						$(token_secret).val(result.access_token_secret);
+						$(configured).val('true');
+						OC.MountConfig.saveStorage(tr);
+						$(tr).find('.configuration').append('<span id="access" style="padding-left:0.5em;">Access granted</span>');
+					} else {
+						OC.dialogs.alert(result.data.message, 'Error configuring Google Drive storage');
+					}
 				});
-				if (params['oauth_token'] !== undefined && params['oauth_verifier'] !== undefined && decodeURIComponent(params['oauth_token']) == $(token).val()) {
-					var tr = $(this);
-					$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 2, oauth_verifier: params['oauth_verifier'], request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) {
-						if (result && result.status == 'success') {
-							$(token).val(result.access_token);
-							$(token_secret).val(result.access_token_secret);
-							OC.MountConfig.saveStorage(tr);
-						} else {
-							OC.dialogs.alert(result.data.message, 'Error configuring Google Drive storage');
-						}
-					});
+			} else if ($(this).find('.google').length == 0) {
+				$(this).find('.configuration').append('<a class="button google">Grant access</a>');
+			}
+		}
+	});
+
+	$('#externalStorage tbody tr').live('change', function() {
+		if ($(this).hasClass('OC_Filestorage_Google') && $(this).find('[data-parameter="configured"]').val() != 'true') {
+			if ($(this).find('.mountPoint input').val() != '') {
+				if ($(this).find('.google').length == 0) {
+					$(this).find('.configuration').append('<a class="button google">Grant access</a>');
 				}
 			}
 		}
 	});
-	
+
+	$('#externalStorage tbody tr .mountPoint input').live('keyup', function() {
+		var tr = $(this).parent().parent();
+		if ($(tr).hasClass('OC_Filestorage_Google') && $(tr).find('[data-parameter="configured"]').val() != 'true' && $(tr).find('.google').length > 0) {
+			if ($(this).val() != '') {
+				$(tr).find('.google').show();
+			} else {
+				$(tr).find('.google').hide();
+			}
+		}
+	});
+
 	$('.google').live('click', function(event) {
 		event.preventDefault();
 		var tr = $(this).parent().parent();
+		var configured = $(this).parent().find('[data-parameter="configured"]');
 		var token = $(this).parent().find('[data-parameter="token"]');
 		var token_secret = $(this).parent().find('[data-parameter="token_secret"]');
 		$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 1, callback: window.location.href }, function(result) {
 			if (result && result.status == 'success') {
+				$(configured).val('false');
 				$(token).val(result.data.request_token);
 				$(token_secret).val(result.data.request_token_secret);
-				OC.MountConfig.saveStorage(tr);
-				window.location = result.data.url;
+				if (OC.MountConfig.saveStorage(tr)) {
+					window.location = result.data.url;
+				} else {
+					OC.dialogs.alert('Fill out all required fields', 'Error configuring Google Drive storage');
+				}
 			} else {
 				OC.dialogs.alert(result.data.message, 'Error configuring Google Drive storage');
 			}
 		});
 	});
-	
+
 });
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 0d942e7845b..23f02bbefcb 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -1,4 +1,4 @@
-OC.MountConfig={	
+OC.MountConfig={
 	saveStorage:function(tr) {
 		var mountPoint = $(tr).find('.mountPoint input').val();
 		if (mountPoint == '') {
@@ -63,6 +63,7 @@ OC.MountConfig={
 				var applicable = OC.currentUser;
 				$.post(OC.filePath('files_external', 'ajax', 'addMountPoint.php'), { mountPoint: mountPoint, class: backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
 			}
+			return true;
 		}
 	}
 }
@@ -77,6 +78,10 @@ $(document).ready(function() {
 		var selected = $(this).find('option:selected').text();
 		var backendClass = $(this).val();
 		$(this).parent().text(selected);
+		if ($(tr).find('.mountPoint input').val() == '') {
+			$(tr).find('.mountPoint input').val(suggestMountPoint(selected.replace(/\s+/g, '')));
+		}
+		$(tr).addClass(backendClass);
 		$(tr).find('.backend').data('class', backendClass);
 		var configurations = $(this).data('configurations');
 		var td = $(tr).find('td.configuration');
@@ -95,7 +100,7 @@ $(document).ready(function() {
 						td.append('<input type="text" data-parameter="'+parameter+'" placeholder="'+placeholder+'" />');
 					}
 				});
-				if (parameters['custom']) {
+				if (parameters['custom'] && $('#externalStorage tbody tr.'+backendClass).length == 1) {
 					OC.addScript('files_external', parameters['custom']);
 				}
 				return false;
@@ -108,6 +113,28 @@ $(document).ready(function() {
 		$(this).remove();
 	});
 
+	function suggestMountPoint(defaultMountPoint) {
+		var i = 1;
+		var append = '';
+		var match = true;
+		while (match && i < 20) {
+			match = false;
+			$('#externalStorage tbody td.mountPoint input').each(function(index, mountPoint) {
+				if ($(mountPoint).val() == defaultMountPoint+append) {
+					match = true;
+					return false;
+				}
+			});
+			if (match) {
+				append = i;
+				i++;
+			} else {
+				break;
+			}
+		}
+		return defaultMountPoint+append;
+	} 
+
 	$('#externalStorage td').live('change', function() {
 		OC.MountConfig.saveStorage($(this).parent());
 	});
diff --git a/apps/files_external/l10n/.gitkeep b/apps/files_external/l10n/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/apps/files_external/l10n/.gitkeep
diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php
new file mode 100644
index 00000000000..aa93379c358
--- /dev/null
+++ b/apps/files_external/l10n/ca.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Emmagatzemament extern",
+"Mount point" => "Punt de muntatge",
+"Backend" => "Dorsal",
+"Configuration" => "Configuració",
+"Options" => "Options",
+"Applicable" => "Aplicable",
+"Add mount point" => "Afegeix punt de muntatge",
+"None set" => "Cap d'establert",
+"All Users" => "Tots els usuaris",
+"Groups" => "Grups",
+"Users" => "Usuaris",
+"Delete" => "Elimina",
+"SSL root certificates" => "Certificats SSL root",
+"Import Root Certificate" => "Importa certificat root",
+"Enable User External Storage" => "Habilita l'emmagatzemament extern d'usuari",
+"Allow users to mount their own external storage" => "Permet als usuaris muntar el seu emmagatzemament extern propi"
+);
diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php
new file mode 100644
index 00000000000..45e5d32dfce
--- /dev/null
+++ b/apps/files_external/l10n/de.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Externer Speicher",
+"Mount point" => "Mount-Point",
+"Backend" => "Backend",
+"Configuration" => "Konfiguration",
+"Options" => "Optionen",
+"Applicable" => "Zutreffend",
+"Add mount point" => "Mount-Point hinzufügen",
+"None set" => "Nicht definiert",
+"All Users" => "Alle Benutzer",
+"Groups" => "Gruppen",
+"Users" => "Benutzer",
+"Delete" => "Löschen",
+"SSL root certificates" => "SSL-Root-Zertifikate",
+"Import Root Certificate" => "Root-Zertifikate importieren",
+"Enable User External Storage" => "Externer Speicher für Benutzer aktivieren",
+"Allow users to mount their own external storage" => "Erlaubt Benutzern Ihre eigenen externen Speicher einzubinden"
+);
diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
new file mode 100644
index 00000000000..b3e76c63500
--- /dev/null
+++ b/apps/files_external/l10n/fr.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Stockage externe",
+"Mount point" => "Point de montage",
+"Backend" => "Infrastructure",
+"Configuration" => "Configuration",
+"Options" => "Options",
+"Applicable" => "Disponible",
+"Add mount point" => "Ajouter un point de montage",
+"None set" => "Aucun spécifié",
+"All Users" => "Tous les utilisateurs",
+"Groups" => "Groupes",
+"Users" => "Utilisateurs",
+"Delete" => "Supprimer",
+"SSL root certificates" => "Certificats racine SSL",
+"Import Root Certificate" => "Importer un certificat racine",
+"Enable User External Storage" => "Activer le stockage externe pour les utilisateurs",
+"Allow users to mount their own external storage" => "Autoriser les utilisateurs à monter leur propre stockage externe"
+);
diff --git a/apps/files_external/l10n/it.php b/apps/files_external/l10n/it.php
new file mode 100644
index 00000000000..927499b0172
--- /dev/null
+++ b/apps/files_external/l10n/it.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Archiviazione esterna",
+"Mount point" => "Punto di mount",
+"Backend" => "Motore",
+"Configuration" => "Configurazione",
+"Options" => "Opzioni",
+"Applicable" => "Applicabile",
+"Add mount point" => "Aggiungi punto di mount",
+"None set" => "Nessuna impostazione",
+"All Users" => "Tutti gli utenti",
+"Groups" => "Gruppi",
+"Users" => "Utenti",
+"Delete" => "Elimina",
+"SSL root certificates" => "Certificato principale per SSL",
+"Import Root Certificate" => "Importa certificato principale",
+"Enable User External Storage" => "Abilita la memoria esterna dell'utente",
+"Allow users to mount their own external storage" => "Consente agli utenti di montare la propria memoria esterna"
+);
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
new file mode 100644
index 00000000000..6a96e2cd693
--- /dev/null
+++ b/apps/files_external/l10n/sl.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"All Users" => "Vsi uporabniki",
+"Groups" => "Skupine",
+"Users" => "Uporabniki",
+"Delete" => "Izbriši",
+"SSL root certificates" => "SSL korenski certifikati",
+"Import Root Certificate" => "Uvozi korenski certifikat",
+"Enable User External Storage" => "Omogoči"
+);
diff --git a/apps/files_external/l10n/sv.php b/apps/files_external/l10n/sv.php
new file mode 100644
index 00000000000..0838df6a32b
--- /dev/null
+++ b/apps/files_external/l10n/sv.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Extern lagring",
+"Mount point" => "Monteringspunkt",
+"Backend" => "Källa",
+"Configuration" => "Konfiguration",
+"Options" => "Alternativ",
+"Applicable" => "Tillämplig",
+"Add mount point" => "Lägg till monteringspunkt",
+"None set" => "Ingen angiven",
+"All Users" => "Alla användare",
+"Groups" => "Grupper",
+"Users" => "Användare",
+"Delete" => "Radera",
+"SSL root certificates" => "SSL rotcertifikat",
+"Import Root Certificate" => "Importera rotcertifikat",
+"Enable User External Storage" => "Aktivera extern lagring för användare",
+"Allow users to mount their own external storage" => "Tillåt användare att montera egen extern lagring"
+);
diff --git a/apps/files_external/l10n/th_TH.php b/apps/files_external/l10n/th_TH.php
new file mode 100644
index 00000000000..84a233046eb
--- /dev/null
+++ b/apps/files_external/l10n/th_TH.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "พื้นทีจัดเก็บข้อมูลจากภายนอก",
+"Mount point" => "จุดชี้ตำแหน่ง",
+"Backend" => "ด้านหลังระบบ",
+"Configuration" => "การกำหนดค่า",
+"Options" => "ตัวเลือก",
+"Applicable" => "สามารถใช้งานได้",
+"Add mount point" => "เพิ่มจุดชี้ตำแหน่ง",
+"None set" => "ยังไม่มีการกำหนด",
+"All Users" => "ผู้ใช้งานทั้งหมด",
+"Groups" => "กลุ่ม",
+"Users" => "ผู้ใช้งาน",
+"Delete" => "ลบ",
+"SSL root certificates" => "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
+"Import Root Certificate" => "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root",
+"Enable User External Storage" => "เปิดให้มีการใช้พื้นที่จัดเก็บข้อมูลของผู้ใช้งานจากภายนอกได้",
+"Allow users to mount their own external storage" => "อนุญาตให้ผู้ใช้งานสามารถชี้ตำแหน่งไปที่พื้นที่จัดเก็บข้อมูลภายนอกของตนเองได้"
+);
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 5630df77a91..f1bc16e2537 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -1,263 +1,263 @@
-<?php
-/**
-* ownCloud
-*
-* @author Michael Gapczynski
-* @copyright 2012 Michael Gapczynski mtgap@owncloud.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
-* Class to configure the config/mount.php and data/$user/mount.php files
-*/
-class OC_Mount_Config {
-
-	const MOUNT_TYPE_GLOBAL = 'global';
-	const MOUNT_TYPE_GROUP = 'group';
-	const MOUNT_TYPE_USER = 'user';
-
-	/**
-	* Get details on each of the external storage backends, used for the mount config UI
-	* If a custom UI is needed, add the key 'custom' and a javascript file with that name will be loaded
-	* If the configuration parameter should be secret, add a '*' to the beginning of the value
-	* If the configuration parameter is a boolean, add a '!' to the beginning of the value
-	* If the configuration parameter is optional, add a '&' to the beginning of the value
-	* If the configuration parameter is hidden, add a '#' to the begining of the value
-	* @return array
-	*/
-	public static function getBackends() {
-		return array(
-			'OC_Filestorage_Local' => array('backend' => 'Local', 'configuration' => array('datadir' => 'Location')),
-			'OC_Filestorage_AmazonS3' => array('backend' => 'Amazon S3', 'configuration' => array('key' => 'Key', 'secret' => '*Secret', 'bucket' => 'Bucket')),
-			'OC_Filestorage_Dropbox' => array('backend' => 'Dropbox', 'configuration' => array('app_key' => 'App key', 'app_secret' => 'App secret', 'token' => '#token', 'token_secret' => '#token_secret'), 'custom' => 'dropbox'),
-			'OC_Filestorage_FTP' => array('backend' => 'FTP', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root', 'secure' => '!Secure ftps://')),
-			'OC_Filestorage_Google' => array('backend' => 'Google Drive', 'configuration' => array('token' => '#token', 'token_secret' => '#token secret'), 'custom' => 'google'),
-			'OC_Filestorage_SWIFT' => array('backend' => 'OpenStack Swift', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'token' => '*Token', 'root' => '&Root', 'secure' => '!Secure ftps://')),
-			'OC_Filestorage_SMB' => array('backend' => 'SMB', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'share' => 'Share', 'root' => '&Root')),
-			'OC_Filestorage_DAV' => array('backend' => 'WebDAV', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root', 'secure' => '!Secure https://'))
-		);
-	}
-
-	/**
-	* Get the system mount points
-	* The returned array is not in the same format as getUserMountPoints()
-	* @return array
-	*/
-	public static function getSystemMountPoints() {
-		$mountPoints = self::readData(false);
-		$backends = self::getBackends();
-		$system = array();
-		if (isset($mountPoints[self::MOUNT_TYPE_GROUP])) {
-			foreach ($mountPoints[self::MOUNT_TYPE_GROUP] as $group => $mounts) {
-				foreach ($mounts as $mountPoint => $mount) {
-					// Remove '/$user/files/' from mount point
-					$mountPoint = substr($mountPoint, 13);
-					// Merge the mount point into the current mount points
-					if (isset($system[$mountPoint]) && $system[$mountPoint]['configuration'] == $mount['options']) {
-						$system[$mountPoint]['applicable']['groups'] = array_merge($system[$mountPoint]['applicable']['groups'], array($group));
-					} else {
-						$system[$mountPoint] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options'], 'applicable' => array('groups' => array($group), 'users' => array()));
-					}
-				}
-			}
-		}
-		if (isset($mountPoints[self::MOUNT_TYPE_USER])) {
-			foreach ($mountPoints[self::MOUNT_TYPE_USER] as $user => $mounts) {
-				foreach ($mounts as $mountPoint => $mount) {
-					// Remove '/$user/files/' from mount point
-					$mountPoint = substr($mountPoint, 13);
-					// Merge the mount point into the current mount points
-					if (isset($system[$mountPoint]) && $system[$mountPoint]['configuration'] == $mount['options']) {
-						$system[$mountPoint]['applicable']['users'] = array_merge($system[$mountPoint]['applicable']['users'], array($user));
-					} else {
-						$system[$mountPoint] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options'], 'applicable' => array('groups' => array(), 'users' => array($user)));
-					}
-				}
-			}
-		}
-		return $system;
-	}
-
-	/**
-	* Get the personal mount points of the current user
-	* The returned array is not in the same format as getUserMountPoints()
-	* @return array
-	*/
-	public static function getPersonalMountPoints() {
-		$mountPoints = self::readData(true);
-		$backends = self::getBackends();
-		$uid = OCP\User::getUser();
-		$personal = array();
-		if (isset($mountPoints[self::MOUNT_TYPE_USER][$uid])) {
-			foreach ($mountPoints[self::MOUNT_TYPE_USER][$uid] as $mountPoint => $mount) {
-				// Remove '/uid/files/' from mount point
-				$personal[substr($mountPoint, strlen($uid) + 8)] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options']);
-			}
-		}
-		return $personal;
-	}
-
-	
-	/**
-	* Add a mount point to the filesystem
-	* @param string Mount point
-	* @param string Backend class
-	* @param array Backend parameters for the class
-	* @param string MOUNT_TYPE_GROUP | MOUNT_TYPE_USER
-	* @param string User or group to apply mount to
-	* @param bool Personal or system mount point i.e. is this being called from the personal or admin page
-	* @return bool
-	*/
-	public static function addMountPoint($mountPoint, $class, $classOptions, $mountType, $applicable, $isPersonal = false) {
-		if ($isPersonal) {
-			// Verify that the mount point applies for the current user
-			// Prevent non-admin users from mounting local storage
-			if ($applicable != OCP\User::getUser() || $class == 'OC_Filestorage_Local') {
-				return false;
-			}
-			$mountPoint = '/'.$applicable.'/files/'.ltrim($mountPoint, '/');
-		} else {
-			$mountPoint = '/$user/files/'.ltrim($mountPoint, '/');
-		}
-		$mount = array($applicable => array($mountPoint => array('class' => $class, 'options' => $classOptions)));
-		$mountPoints = self::readData($isPersonal);
-		// Merge the new mount point into the current mount points
-		if (isset($mountPoints[$mountType])) {
-			if (isset($mountPoints[$mountType][$applicable])) {
-				$mountPoints[$mountType][$applicable] = array_merge($mountPoints[$mountType][$applicable], $mount[$applicable]);
-			} else {
-				$mountPoints[$mountType] = array_merge($mountPoints[$mountType], $mount);
-			}
-		} else {
-			$mountPoints[$mountType] = $mount;
-		}
-		self::writeData($isPersonal, $mountPoints);
-		return true;
-	}
-
-	/**
-	*
-	* @param string Mount point
-	* @param string MOUNT_TYPE_GROUP | MOUNT_TYPE_USER
-	* @param string User or group to remove mount from
-	* @param bool Personal or system mount point
-	* @return bool
-	*/
-	public static function removeMountPoint($mountPoint, $mountType, $applicable, $isPersonal = false) {
-		// Verify that the mount point applies for the current user
-		if ($isPersonal) {
-			if ($applicable != OCP\User::getUser()) {
-				return false;
-			}
-			$mountPoint = '/'.$applicable.'/files/'.ltrim($mountPoint, '/');
-		} else {
-			$mountPoint = '/$user/files/'.ltrim($mountPoint, '/');
-		}
-		$mountPoints = self::readData($isPersonal);
-		// Remove mount point
-		unset($mountPoints[$mountType][$applicable][$mountPoint]);
-		// Unset parent arrays if empty
-		if (empty($mountPoints[$mountType][$applicable])) {
-			unset($mountPoints[$mountType][$applicable]);
-			if (empty($mountPoints[$mountType])) {
-				unset($mountPoints[$mountType]);
-			}
-		}
-		self::writeData($isPersonal, $mountPoints);
-		return true;
-	}
-
-	/**
-	* Read the mount points in the config file into an array
-	* @param bool Personal or system config file
-	* @return array
-	*/
-	private static function readData($isPersonal) {
-		if ($isPersonal) {
-			$file = OC::$SERVERROOT.'/data/'.OCP\User::getUser().'/mount.php';
-		} else {
-			$file = OC::$SERVERROOT.'/config/mount.php';
-		}
-		if (is_file($file)) {
-			$mountPoints = include($file);
-			if (is_array($mountPoints)) {
-				return $mountPoints;
-			}
-		}
-		return array();
-	}
-
-	/**
-	* Write the mount points to the config file
-	* @param bool Personal or system config file
-	* @param array Mount points
-	*/
-	private static function writeData($isPersonal, $data) {
-		if ($isPersonal) {
-			$file = OC::$SERVERROOT.'/data/'.OCP\User::getUser().'/mount.php';
-		} else {
-			$file = OC::$SERVERROOT.'/config/mount.php';
-		}
-		$content = "<?php return array (\n";
-		if (isset($data[self::MOUNT_TYPE_GROUP])) {
-			$content .= "\t'group' => array (\n";
-			foreach ($data[self::MOUNT_TYPE_GROUP] as $group => $mounts) {
-				$content .= "\t\t'".$group."' => array (\n";
-				foreach ($mounts as $mountPoint => $mount) {
-					$content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).",\n";
-					
-				}
-				$content .= "\t\t),\n";
-			}
-			$content .= "\t),\n";
-		}
-		if (isset($data[self::MOUNT_TYPE_USER])) {
-			$content .= "\t'user' => array (\n";
-			foreach ($data[self::MOUNT_TYPE_USER] as $user => $mounts) {
-				$content .= "\t\t'".$user."' => array (\n";
-				foreach ($mounts as $mountPoint => $mount) {
-					$content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).",\n";
-				}
-				$content .= "\t\t),\n";
-			}
-			$content .= "\t),\n";
-		}
-		$content .= ");\n?>";
-		@file_put_contents($file, $content);
-	}
-	
+<?php

+/**

+* ownCloud

+*

+* @author Michael Gapczynski

+* @copyright 2012 Michael Gapczynski mtgap@owncloud.com

+*

+* This library is free software; you can redistribute it and/or

+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE

+* License as published by the Free Software Foundation; either

+* version 3 of the License, or any later version.

+*

+* This library is distributed in the hope that it will be useful,

+* but WITHOUT ANY WARRANTY; without even the implied warranty of

+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.

+*

+* You should have received a copy of the GNU Affero General Public

+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.

+*/

+

+/**

+* Class to configure the config/mount.php and data/$user/mount.php files

+*/

+class OC_Mount_Config {

+

+	const MOUNT_TYPE_GLOBAL = 'global';

+	const MOUNT_TYPE_GROUP = 'group';

+	const MOUNT_TYPE_USER = 'user';

+

+	/**

+	* Get details on each of the external storage backends, used for the mount config UI

+	* If a custom UI is needed, add the key 'custom' and a javascript file with that name will be loaded

+	* If the configuration parameter should be secret, add a '*' to the beginning of the value

+	* If the configuration parameter is a boolean, add a '!' to the beginning of the value

+	* If the configuration parameter is optional, add a '&' to the beginning of the value

+	* If the configuration parameter is hidden, add a '#' to the begining of the value

+	* @return array

+	*/

+	public static function getBackends() {

+		return array(

+			'OC_Filestorage_Local' => array('backend' => 'Local', 'configuration' => array('datadir' => 'Location')),

+			'OC_Filestorage_AmazonS3' => array('backend' => 'Amazon S3', 'configuration' => array('key' => 'Key', 'secret' => '*Secret', 'bucket' => 'Bucket')),

+			'OC_Filestorage_Dropbox' => array('backend' => 'Dropbox', 'configuration' => array('configured' => '#configured','app_key' => 'App key', 'app_secret' => 'App secret', 'token' => '#token', 'token_secret' => '#token_secret'), 'custom' => 'dropbox'),

+			'OC_Filestorage_FTP' => array('backend' => 'FTP', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root', 'secure' => '!Secure ftps://')),

+			'OC_Filestorage_Google' => array('backend' => 'Google Drive', 'configuration' => array('configured' => '#configured', 'token' => '#token', 'token_secret' => '#token secret'), 'custom' => 'google'),

+			'OC_Filestorage_SWIFT' => array('backend' => 'OpenStack Swift', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'token' => '*Token', 'root' => '&Root', 'secure' => '!Secure ftps://')),

+			'OC_Filestorage_SMB' => array('backend' => 'SMB', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'share' => 'Share', 'root' => '&Root')),

+			'OC_Filestorage_DAV' => array('backend' => 'WebDAV', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root', 'secure' => '!Secure https://'))

+		);

+	}

+

+	/**

+	* Get the system mount points

+	* The returned array is not in the same format as getUserMountPoints()

+	* @return array

+	*/

+	public static function getSystemMountPoints() {

+		$mountPoints = self::readData(false);

+		$backends = self::getBackends();

+		$system = array();

+		if (isset($mountPoints[self::MOUNT_TYPE_GROUP])) {

+			foreach ($mountPoints[self::MOUNT_TYPE_GROUP] as $group => $mounts) {

+				foreach ($mounts as $mountPoint => $mount) {

+					// Remove '/$user/files/' from mount point

+					$mountPoint = substr($mountPoint, 13);

+					// Merge the mount point into the current mount points

+					if (isset($system[$mountPoint]) && $system[$mountPoint]['configuration'] == $mount['options']) {

+						$system[$mountPoint]['applicable']['groups'] = array_merge($system[$mountPoint]['applicable']['groups'], array($group));

+					} else {

+						$system[$mountPoint] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options'], 'applicable' => array('groups' => array($group), 'users' => array()));

+					}

+				}

+			}

+		}

+		if (isset($mountPoints[self::MOUNT_TYPE_USER])) {

+			foreach ($mountPoints[self::MOUNT_TYPE_USER] as $user => $mounts) {

+				foreach ($mounts as $mountPoint => $mount) {

+					// Remove '/$user/files/' from mount point

+					$mountPoint = substr($mountPoint, 13);

+					// Merge the mount point into the current mount points

+					if (isset($system[$mountPoint]) && $system[$mountPoint]['configuration'] == $mount['options']) {

+						$system[$mountPoint]['applicable']['users'] = array_merge($system[$mountPoint]['applicable']['users'], array($user));

+					} else {

+						$system[$mountPoint] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options'], 'applicable' => array('groups' => array(), 'users' => array($user)));

+					}

+				}

+			}

+		}

+		return $system;

+	}

+

+	/**

+	* Get the personal mount points of the current user

+	* The returned array is not in the same format as getUserMountPoints()

+	* @return array

+	*/

+	public static function getPersonalMountPoints() {

+		$mountPoints = self::readData(true);

+		$backends = self::getBackends();

+		$uid = OCP\User::getUser();

+		$personal = array();

+		if (isset($mountPoints[self::MOUNT_TYPE_USER][$uid])) {

+			foreach ($mountPoints[self::MOUNT_TYPE_USER][$uid] as $mountPoint => $mount) {

+				// Remove '/uid/files/' from mount point

+				$personal[substr($mountPoint, strlen($uid) + 8)] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options']);

+			}

+		}

+		return $personal;

+	}

+

+	

+	/**

+	* Add a mount point to the filesystem

+	* @param string Mount point

+	* @param string Backend class

+	* @param array Backend parameters for the class

+	* @param string MOUNT_TYPE_GROUP | MOUNT_TYPE_USER

+	* @param string User or group to apply mount to

+	* @param bool Personal or system mount point i.e. is this being called from the personal or admin page

+	* @return bool

+	*/

+	public static function addMountPoint($mountPoint, $class, $classOptions, $mountType, $applicable, $isPersonal = false) {

+		if ($isPersonal) {

+			// Verify that the mount point applies for the current user

+			// Prevent non-admin users from mounting local storage

+			if ($applicable != OCP\User::getUser() || $class == 'OC_Filestorage_Local') {

+				return false;

+			}

+			$mountPoint = '/'.$applicable.'/files/'.ltrim($mountPoint, '/');

+		} else {

+			$mountPoint = '/$user/files/'.ltrim($mountPoint, '/');

+		}

+		$mount = array($applicable => array($mountPoint => array('class' => $class, 'options' => $classOptions)));

+		$mountPoints = self::readData($isPersonal);

+		// Merge the new mount point into the current mount points

+		if (isset($mountPoints[$mountType])) {

+			if (isset($mountPoints[$mountType][$applicable])) {

+				$mountPoints[$mountType][$applicable] = array_merge($mountPoints[$mountType][$applicable], $mount[$applicable]);

+			} else {

+				$mountPoints[$mountType] = array_merge($mountPoints[$mountType], $mount);

+			}

+		} else {

+			$mountPoints[$mountType] = $mount;

+		}

+		self::writeData($isPersonal, $mountPoints);

+		return true;

+	}

+

+	/**

+	*

+	* @param string Mount point

+	* @param string MOUNT_TYPE_GROUP | MOUNT_TYPE_USER

+	* @param string User or group to remove mount from

+	* @param bool Personal or system mount point

+	* @return bool

+	*/

+	public static function removeMountPoint($mountPoint, $mountType, $applicable, $isPersonal = false) {

+		// Verify that the mount point applies for the current user

+		if ($isPersonal) {

+			if ($applicable != OCP\User::getUser()) {

+				return false;

+			}

+			$mountPoint = '/'.$applicable.'/files/'.ltrim($mountPoint, '/');

+		} else {

+			$mountPoint = '/$user/files/'.ltrim($mountPoint, '/');

+		}

+		$mountPoints = self::readData($isPersonal);

+		// Remove mount point

+		unset($mountPoints[$mountType][$applicable][$mountPoint]);

+		// Unset parent arrays if empty

+		if (empty($mountPoints[$mountType][$applicable])) {

+			unset($mountPoints[$mountType][$applicable]);

+			if (empty($mountPoints[$mountType])) {

+				unset($mountPoints[$mountType]);

+			}

+		}

+		self::writeData($isPersonal, $mountPoints);

+		return true;

+	}

+

+	/**

+	* Read the mount points in the config file into an array

+	* @param bool Personal or system config file

+	* @return array

+	*/

+	private static function readData($isPersonal) {

+		if ($isPersonal) {

+			$file = OC::$SERVERROOT.'/data/'.OCP\User::getUser().'/mount.php';

+		} else {

+			$file = OC::$SERVERROOT.'/config/mount.php';

+		}

+		if (is_file($file)) {

+			$mountPoints = include($file);

+			if (is_array($mountPoints)) {

+				return $mountPoints;

+			}

+		}

+		return array();

+	}

+

+	/**

+	* Write the mount points to the config file

+	* @param bool Personal or system config file

+	* @param array Mount points

+	*/

+	private static function writeData($isPersonal, $data) {

+		if ($isPersonal) {

+			$file = OC::$SERVERROOT.'/data/'.OCP\User::getUser().'/mount.php';

+		} else {

+			$file = OC::$SERVERROOT.'/config/mount.php';

+		}

+		$content = "<?php return array (\n";

+		if (isset($data[self::MOUNT_TYPE_GROUP])) {

+			$content .= "\t'group' => array (\n";

+			foreach ($data[self::MOUNT_TYPE_GROUP] as $group => $mounts) {

+				$content .= "\t\t'".$group."' => array (\n";

+				foreach ($mounts as $mountPoint => $mount) {

+					$content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).",\n";

+					

+				}

+				$content .= "\t\t),\n";

+			}

+			$content .= "\t),\n";

+		}

+		if (isset($data[self::MOUNT_TYPE_USER])) {

+			$content .= "\t'user' => array (\n";

+			foreach ($data[self::MOUNT_TYPE_USER] as $user => $mounts) {

+				$content .= "\t\t'".$user."' => array (\n";

+				foreach ($mounts as $mountPoint => $mount) {

+					$content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).",\n";

+				}

+				$content .= "\t\t),\n";

+			}

+			$content .= "\t),\n";

+		}

+		$content .= ");\n?>";

+		@file_put_contents($file, $content);

+	}

+	

 	/**

 	 * Returns all user uploaded ssl root certificates

 	 * @return array

 	 */

-	public static function getCertificates() {
-		$view = \OCP\Files::getStorage('files_external');
-		$path=\OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").'uploads/';
-		if (!is_dir($path)) mkdir($path);
-		$result = array();
-		$handle = opendir($path);
-		while (false !== ($file = readdir($handle))) {
-			if($file != '.' && $file != '..') $result[] = $file;
-		}
-		return $result;
-	}
-	
-	/**
-	 * creates certificate bundle
-	 */
-	public static function createCertificateBundle() {
+	public static function getCertificates() {

+		$view = \OCP\Files::getStorage('files_external');

+		$path=\OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").'uploads/';

+		if (!is_dir($path)) mkdir($path);

+		$result = array();

+		$handle = opendir($path);

+		while (false !== ($file = readdir($handle))) {

+			if($file != '.' && $file != '..') $result[] = $file;

+		}

+		return $result;

+	}

+	

+	/**

+	 * creates certificate bundle

+	 */

+	public static function createCertificateBundle() {

 		$view = \OCP\Files::getStorage("files_external");

 		$path = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("");

 		

@@ -267,17 +267,17 @@ class OC_Mount_Config {
 			$file=$path.'/uploads/'.$cert;

 			$fh = fopen($file, "r");

 			$data = fread($fh, filesize($file));

-			fclose($fh);
+			fclose($fh);

 			if (strpos($data, 'BEGIN CERTIFICATE')) {

-				fwrite($fh_certs, $data);
+				fwrite($fh_certs, $data);

 			}

 		}

 		

-		fclose($fh_certs);
-		
-		return true;
-	} 
-
-}
-
+		fclose($fh_certs);

+		

+		return true;

+	} 

+

+}

+

 ?>
\ No newline at end of file
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index c849db38433..a27d9d7c368 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -30,9 +30,13 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 	private static $tempFiles = array();
 
 	public function __construct($params) {
-		$oauth = new Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
-		$oauth->setToken($params['token'], $params['token_secret']);
-		$this->dropbox = new Dropbox_API($oauth, 'dropbox');
+		if (isset($params['configured']) && $params['configured'] == 'true' && isset($params['app_key']) && isset($params['app_secret']) && isset($params['token']) && isset($params['token_secret'])) {
+			$oauth = new Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
+			$oauth->setToken($params['token'], $params['token_secret']);
+			$this->dropbox = new Dropbox_API($oauth, 'dropbox');
+		} else {
+			throw new Exception('Creating OC_Filestorage_Dropbox storage failed');
+		}
 	}
 
 	private function getMetaData($path, $list = false) {
@@ -43,6 +47,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 				try {
 					$response = $this->dropbox->getMetaData($path);
 				} catch (Exception $exception) {
+					OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
 					return false;
 				}
 				if ($response && isset($response['contents'])) {
@@ -63,6 +68,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 					$this->metaData[$path] = $response;
 					return $response;
 				} catch (Exception $exception) {
+					OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
 					return false;
 				}
 			}
@@ -74,6 +80,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 			$this->dropbox->createFolder($path);
 			return true;
 		} catch (Exception $exception) {
+			OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
 			return false;
 		}
 	}
@@ -141,6 +148,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 			$this->dropbox->delete($path);
 			return true;
 		} catch (Exception $exception) {
+			OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
 			return false;
 		}
 	}
@@ -150,6 +158,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 			$this->dropbox->move($path1, $path2);
 			return true;
 		} catch (Exception $exception) {
+			OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
 			return false;
 		}
 	}
@@ -159,6 +168,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 			$this->dropbox->copy($path1, $path2);
 			return true;
 		} catch (Exception $exception) {
+			OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
 			return false;
 		}
 	}
@@ -173,6 +183,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 					file_put_contents($tmpFile, $data);
 					return fopen($tmpFile, 'r');
 				} catch (Exception $exception) {
+					OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
 					return false;
 				}
 			case 'w':
@@ -211,7 +222,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 				$this->dropbox->putFile(self::$tempFiles[$tmpFile], $handle);
 				unlink($tmpFile);
 			} catch (Exception $exception) {
-				
+				OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
 			}
 		}
 	}
@@ -230,6 +241,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 			$info = $this->dropbox->getAccountInfo();
 			return $info['quota_info']['quota'] - $info['quota_info']['normal'];
 		} catch (Exception $exception) {
+			OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
 			return false;
 		}
 	}
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 2ad85d09d5f..2b387f0c833 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -31,13 +31,17 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 
 	private static $tempFiles = array();
 
-	public function __construct($arguments) {
-		$consumer_key = isset($arguments['consumer_key']) ? $arguments['consumer_key'] : 'anonymous';
-		$consumer_secret = isset($arguments['consumer_secret']) ? $arguments['consumer_secret'] : 'anonymous';
-		$this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
-		$this->oauth_token = new OAuthToken($arguments['token'], $arguments['token_secret']);
-		$this->sig_method = new OAuthSignatureMethod_HMAC_SHA1();
-		$this->entries = array();
+	public function __construct($params) {
+		if (isset($params['configured']) && $params['configured'] == 'true' && isset($params['token']) && isset($params['token_secret'])) {
+			$consumer_key = isset($params['consumer_key']) ? $params['consumer_key'] : 'anonymous';
+			$consumer_secret = isset($params['consumer_secret']) ? $params['consumer_secret'] : 'anonymous';
+			$this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
+			$this->oauth_token = new OAuthToken($params['token'], $params['token_secret']);
+			$this->sig_method = new OAuthSignatureMethod_HMAC_SHA1();
+			$this->entries = array();
+		} else {
+			throw new Exception('Creating OC_Filestorage_Google storage failed');
+		}
 	}
 
 	private function sendRequest($uri, $httpMethod, $postData = null, $extraHeaders = null, $isDownload = false, $returnHeaders = false, $isContentXML = true, $returnHTTPCode = false) {
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index e8bc94790dc..397f0d951b0 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -15,7 +15,7 @@
 			<tbody width="100%">
 			<?php $_['mounts'] = array_merge($_['mounts'], array('' => array())); ?>
 			<?php foreach ($_['mounts'] as $mountPoint => $mount): ?>
-				<tr <?php if ($mountPoint == '') echo 'id="addMountPoint"'; ?>>
+				<tr <?php echo ($mountPoint != '') ? 'class="'.$mount['class'].'"' : 'id="addMountPoint"'; ?>>
 					<td class="mountPoint"><input type="text" name="mountPoint" value="<?php echo $mountPoint; ?>" placeholder="<?php echo $l->t('Mount point'); ?>" /></td>
 					<?php if ($mountPoint == ''): ?>
 						<td class="backend">
diff --git a/apps/files_sharing/l10n/.gitkeep b/apps/files_sharing/l10n/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/apps/files_sharing/l10n/.gitkeep
diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php
new file mode 100644
index 00000000000..02d554c7f5d
--- /dev/null
+++ b/apps/files_sharing/l10n/ca.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Els vostres fitxers compartits",
+"Item" => "Element",
+"Shared With" => "Compartit amb",
+"Permissions" => "Permisos",
+"Read" => "Llegeix",
+"Edit" => "Edita",
+"Delete" => "Elimina",
+"Enable Resharing" => "Permet compartir amb tercers",
+"Allow users to reshare files they don't own" => "Permet als usuaris compartir fitxers que no són seus"
+);
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
new file mode 100644
index 00000000000..d0526c0f3cf
--- /dev/null
+++ b/apps/files_sharing/l10n/de.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Ihre geteilten Dateien",
+"Item" => "Objekt",
+"Shared With" => "Teilen mit",
+"Permissions" => "Berechtigungen",
+"Read" => "Lesen",
+"Edit" => "Bearbeiten",
+"Delete" => "Löschen",
+"Enable Resharing" => "Austausch ermöglichen",
+"Allow users to reshare files they don't own" => "Benutzer dürfen Dateien nochmals teilen, auch wenn sie nicht der Besitzer dieser Dateien sind."
+);
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
new file mode 100644
index 00000000000..47219c00804
--- /dev/null
+++ b/apps/files_sharing/l10n/fr.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Vos documents partagés",
+"Item" => "Item",
+"Shared With" => "Partagé avec",
+"Permissions" => "Permissions",
+"Read" => "Lecture",
+"Edit" => "Édition",
+"Delete" => "Effacement",
+"Enable Resharing" => "Permettre le repartage",
+"Allow users to reshare files they don't own" => "Permettre aux utilisateurs de repartager des fichiers dont ils ne sont pas propriétaires"
+);
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
new file mode 100644
index 00000000000..5534dfca03c
--- /dev/null
+++ b/apps/files_sharing/l10n/it.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "I tuoi file condivisi",
+"Item" => "Elemento",
+"Shared With" => "Condiviso con",
+"Permissions" => "Permessi",
+"Read" => "Lettura",
+"Edit" => "Modifica",
+"Delete" => "Eliminazione"
+);
diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php
new file mode 100644
index 00000000000..e087d4a293a
--- /dev/null
+++ b/apps/files_sharing/l10n/pl.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Twoje udostępnione pliki",
+"Item" => "Element",
+"Shared With" => "Udostępnione dla",
+"Permissions" => "Uprawnienia",
+"Read" => "Odczyt",
+"Edit" => "Edycja",
+"Delete" => "Usuń",
+"Enable Resharing" => "Włącz ponowne udostępnianie",
+"Allow users to reshare files they don't own" => "Zezwalaj użytkownikom na ponowne udostępnienie plików, które są im udostępnione"
+);
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
new file mode 100644
index 00000000000..a2a1a2b1a9a
--- /dev/null
+++ b/apps/files_sharing/l10n/sl.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Vaše datoteke v souporabi",
+"Item" => "Predmet",
+"Shared With" => "V souporabi z",
+"Permissions" => "Dovoljenja",
+"Read" => "Branje",
+"Edit" => "Pisanje",
+"Delete" => "Izbris",
+"Enable Resharing" => "Omogoči nadaljnjo izmenjavo",
+"Allow users to reshare files they don't own" => "Dovoli uporabnikom nadaljnjo izmenjavo tujih datotek"
+);
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
new file mode 100644
index 00000000000..8eb48c3b6de
--- /dev/null
+++ b/apps/files_sharing/l10n/sv.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Dina delade filer",
+"Item" => "Objekt",
+"Shared With" => "Delad med",
+"Permissions" => "Rättigheter",
+"Read" => "Läsa",
+"Edit" => "Ändra",
+"Delete" => "Radera",
+"Enable Resharing" => "Aktivera dela vidare",
+"Allow users to reshare files they don't own" => "Tillåter användare att dela filer som dom inte äger"
+);
diff --git a/apps/files_sharing/l10n/th_TH.php b/apps/files_sharing/l10n/th_TH.php
new file mode 100644
index 00000000000..2ff91112344
--- /dev/null
+++ b/apps/files_sharing/l10n/th_TH.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "ไฟล์ของคุณที่แชร์ไว้",
+"Item" => "ไอเท็ม",
+"Shared With" => "แชร์พร้อมกับ",
+"Permissions" => "สิทธิ์การเข้าใช้งาน",
+"Read" => "อ่าน",
+"Edit" => "แก้ไข",
+"Delete" => "ลบ",
+"Enable Resharing" => "เปิดให้มีการแชร์ใหม่อีกครั้งได้",
+"Allow users to reshare files they don't own" => "อนุญาตให้ผู้ใช้งานสามารถแชร์ไฟล์ที่ไม่ได้เป็นเจ้าของใหม่ได้"
+);
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index a34c92ee422..27dc8bfc382 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -28,7 +28,7 @@ $tmpl = new OCP\Template( 'files_versions', 'history', 'user' );
 if ( isset( $_GET['path'] ) ) {
 
 	$path = $_GET['path'];
-	$path = strip_tags( $path );
+	$path = $path;
 	$tmpl->assign( 'path', $path );
 	$versions = new OCA_Versions\Storage();
 
diff --git a/apps/files_versions/l10n/.gitkeep b/apps/files_versions/l10n/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/apps/files_versions/l10n/.gitkeep
diff --git a/apps/files_versions/l10n/ca.php b/apps/files_versions/l10n/ca.php
new file mode 100644
index 00000000000..8388556bec6
--- /dev/null
+++ b/apps/files_versions/l10n/ca.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Expira totes les versions",
+"Enable Files Versioning" => "Habilita les versions de fitxers"
+);
diff --git a/apps/files_versions/l10n/de.php b/apps/files_versions/l10n/de.php
new file mode 100644
index 00000000000..3d1a0a43f5e
--- /dev/null
+++ b/apps/files_versions/l10n/de.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Alle Versionen löschen",
+"Enable Files Versioning" => "Datei-Versionierung aktivieren"
+);
diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php
new file mode 100644
index 00000000000..02209f543b1
--- /dev/null
+++ b/apps/files_versions/l10n/fr.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Supprimer les versions intermédiaires",
+"Enable Files Versioning" => "Activer le versionnage"
+);
diff --git a/apps/files_versions/l10n/it.php b/apps/files_versions/l10n/it.php
new file mode 100644
index 00000000000..9711ce18aa8
--- /dev/null
+++ b/apps/files_versions/l10n/it.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Scadenza di tutte le versioni",
+"Enable Files Versioning" => "Abilita controllo di versione"
+);
diff --git a/apps/files_versions/l10n/pl.php b/apps/files_versions/l10n/pl.php
new file mode 100644
index 00000000000..faf2d39e709
--- /dev/null
+++ b/apps/files_versions/l10n/pl.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Wygasają wszystkie wersje",
+"Enable Files Versioning" => "Włącz wersjonowanie plików"
+);
diff --git a/apps/files_versions/l10n/sv.php b/apps/files_versions/l10n/sv.php
new file mode 100644
index 00000000000..03d4d54d0b9
--- /dev/null
+++ b/apps/files_versions/l10n/sv.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Upphör alla versioner",
+"Enable Files Versioning" => "Aktivera versionshantering"
+);
diff --git a/apps/files_versions/l10n/th_TH.php b/apps/files_versions/l10n/th_TH.php
new file mode 100644
index 00000000000..e880840f4b9
--- /dev/null
+++ b/apps/files_versions/l10n/th_TH.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "หมดอายุทุกรุ่น",
+"Enable Files Versioning" => "เปิดใช้งานคุณสมบัติการแยกสถานะรุ่นหรือเวอร์ชั่นของไฟล์"
+);
diff --git a/apps/files_versions/templates/settings-personal.php b/apps/files_versions/templates/settings-personal.php
index 7ff016b585e..fe9ba381e58 100644
--- a/apps/files_versions/templates/settings-personal.php
+++ b/apps/files_versions/templates/settings-personal.php
@@ -4,6 +4,6 @@
 			<strong>Versions</strong><!-- translate using echo $l->t('foo'); -->
 		</legend>
 		<p>This will delete all existing backup versions of your files</p><!-- translate using echo $l->t('foo'); -->
-		<button id="expireAllBtn">Expire all versions<img style="display: none;" class="expireAllLoading" src="<?php echo OCP\Util::linkTo('core', 'img/loading.gif'); ?>" /></button>
+		<button id="expireAllBtn">Expire all versions<img style="display: none;" class="expireAllLoading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" /></button>
 	</fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/apps/gallery/l10n/th_TH.php b/apps/gallery/l10n/th_TH.php
index 34da8dc57fb..9bb699e2644 100644
--- a/apps/gallery/l10n/th_TH.php
+++ b/apps/gallery/l10n/th_TH.php
@@ -1,12 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "รูปภาพ",
-"Settings" => "ตั้งค่า",
-"Rescan" => "ตรวจสอบอีกครั้ง",
-"Stop" => "หยุด",
-"Share" => "แชร์",
-"Back" => "ย้อนกลับ",
-"Remove confirmation" => "การยืนยันการลบ",
-"Do you want to remove album" => "คุณต้องการลบอัลบั้มออกหรือไม่",
-"Change album name" => "เปลี่ยนชื่ออัลบั้ม",
-"New album name" => "ชื่อใหม่ของอัลบั้ม"
+"Share gallery" => "แชร์ข้อมูลแกลอรี่",
+"Error: " => "พบข้อผิดพลาด: ",
+"Internal error" => "เกิดข้อผิดพลาดภายในระบบ",
+"Slideshow" => "ภาพสไลด์โชว์"
 );
diff --git a/apps/gallery/templates/view_album.php b/apps/gallery/templates/view_album.php
deleted file mode 100644
index 00e891103f1..00000000000
--- a/apps/gallery/templates/view_album.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-OCP\Util::addStyle('gallery', 'styles');
-OCP\Util::addScript('gallery', 'albums');
-OCP\Util::addScript('gallery', 'album_cover');
-OCP\Util::addScript('files_imageviewer', 'jquery.mousewheel-3.0.4.pack');
-OCP\Util::addScript('files_imageviewer', 'jquery.fancybox-1.3.4.pack');
-OCP\Util::addStyle( 'files_imageviewer', 'jquery.fancybox-1.3.4' );
-$l = OC_L10N::get('gallery');
-?>
-<script type="text/javascript">
-  $(document).ready(function() {
-    $("a[rel=images]").fancybox({
-    'titlePosition': 'inside'
-    });
-  });
-</script>
-
-<div id="controls">
-  <a href="?"><input type="button" value="<?php echo $l->t('Back');?>" /></a>
-<br/>
-</div>
-
-<div id="gallery_list" class="leftcontent">
-</div>
-
-<div id="gallery_images" class="rightcontent">
-<?php
-foreach ($_['photos'] as $a) {
-?>
-<a rel="images" href="../../files/download.php?file=<?php echo urlencode($a); ?>"><img src="ajax/thumbnail.php?img=<?php echo urlencode($a) ?>"></a>
-<?php
-  }
-?>
-</div>
-
-<div id="dialog-confirm" title="<?php echo $l->t('Remove confirmation');?>" style="display: none">
-  <p><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span><?php echo $l->t('Do you want to remove album');?> <span id="albumName"></span>?</p>
-</div>
-
-<div id="dialog-form" title="<?php echo $l->t('Change album name');?>" style="display:none">
-	<form>
-	<fieldset>
-    <label for="name"><?php echo $l->t('New album name');?></label>
-		<input type="text" name="name" id="name" class="text ui-widget-content ui-corner-all" />
-	</fieldset>
-	</form>
-</div>
diff --git a/apps/media/l10n/zh_CN.GB2312.php b/apps/media/l10n/zh_CN.GB2312.php
new file mode 100644
index 00000000000..de7e98acd9e
--- /dev/null
+++ b/apps/media/l10n/zh_CN.GB2312.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Music" => "音乐",
+"Add album to playlist" => "添加专辑到播放列表",
+"Play" => "播放",
+"Pause" => "暂停",
+"Previous" => "前面的",
+"Next" => "下一个",
+"Mute" => "静音",
+"Unmute" => "取消静音",
+"Rescan Collection" => "重新扫描收藏",
+"Artist" => "艺术家",
+"Album" => "专辑",
+"Title" => "标题"
+);
diff --git a/apps/remoteStorage/remoteStorage.png b/apps/remoteStorage/img/remoteStorage.png
index 6b751c09997..6b751c09997 100644
--- a/apps/remoteStorage/remoteStorage.png
+++ b/apps/remoteStorage/img/remoteStorage.png
diff --git a/apps/remoteStorage/templates/settings.php b/apps/remoteStorage/templates/settings.php
index 147378dda39..1d2a188f527 100644
--- a/apps/remoteStorage/templates/settings.php
+++ b/apps/remoteStorage/templates/settings.php
@@ -1,10 +1,6 @@
 	<fieldset class="personalblock">
-		<?php
-			echo '<img src="../apps/remoteStorage/remoteStorage.png" style="width:16px"> '
-				.'<strong>'.$l->t('remoteStorage').'</strong> user address: '
-				.OCP\USER::getUser().'@'.$_SERVER['SERVER_NAME']
-				.' (<a href="http://unhosted.org/">more info</a>)';
-		?>
+		<img src="<?php echo image_path('remoteStorage', 'remoteStorage.png') ?>" style="width:16px">
+		<strong><?php echo $l->t('remoteStorage') ?></strong> user address: <?php echo OCP\USER::getUser().'@'.$_SERVER['SERVER_NAME'] ?> (<a href="http://unhosted.org/">more info</a>)
 		<p><em>Apps that currently have access to your ownCloud:</em></p>
 		<script>
 			function revokeToken(token) {
@@ -14,15 +10,13 @@
 			}
 		</script>
 		<ul>
-		<?php
-			foreach(OC_remoteStorage::getAllTokens() as $token => $details) {
-				echo '<li onmouseover="'
-					.'document.getElementById(\'revoke_'.$token.'\').style.display=\'inline\';"'
-					.'onmouseout="document.getElementById(\'revoke_'.$token.'\').style.display=\'none\';"'
-					.'> <strong>'.$details['appUrl'].'</strong>: '.$details['categories']
-					.' <a href="#" title="Revoke" class="action" style="display:none" id="revoke_'.$token.'" onclick="'
-					.'revokeToken(\''.$token.'\');this.parentNode.style.display=\'none\';"'
-					.'><img src="/core/img/actions/delete.svg"></a></li>'."\n";
-			}
-		?></ul>
+		<?php foreach(OC_remoteStorage::getAllTokens() as $token => $details) { ?>
+			<li onmouseover="$('#revoke_<?php echo $token ?>').show();" onmouseout="$('#revoke_<?php echo $token ?>').hide();">
+				<strong><?php echo $details['appUrl'] ?></strong>: <?php echo $details['categories'] ?>
+				<a href="#" title="Revoke" class="action" style="display:none" id="revoke_<?php echo $token ?>" onclick="revokeToken('<?php echo $token ?>');$(this).hide();">
+					<img src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg') ?>">
+				</a>
+			</li>
+		<?php } ?>
+		</ul>
 	</fieldset>
diff --git a/apps/tasks/l10n/.gitkeep b/apps/tasks/l10n/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/apps/tasks/l10n/.gitkeep
diff --git a/apps/tasks/l10n/ca.php b/apps/tasks/l10n/ca.php
new file mode 100644
index 00000000000..2608d8b9b17
--- /dev/null
+++ b/apps/tasks/l10n/ca.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "data/hora incorrecta",
+"Tasks" => "Tasques",
+"No category" => "Cap categoria",
+"Unspecified" => "Sense especificar",
+"1=highest" => "1=major",
+"5=medium" => "5=mitjana",
+"9=lowest" => "9=inferior",
+"Empty Summary" => "Elimina el resum",
+"Invalid percent complete" => "Percentatge completat no vàlid",
+"Invalid priority" => "Prioritat no vàlida",
+"Add Task" => "Afegeix una tasca",
+"Order Due" => "Ordena per",
+"Order List" => "Ordena per llista",
+"Order Complete" => "Ordena els complets",
+"Order Location" => "Ordena per ubicació",
+"Order Priority" => "Ordena per prioritat",
+"Order Label" => "Ordena per etiqueta",
+"Loading tasks..." => "Carregant les tasques...",
+"Important" => "Important",
+"More" => "Més",
+"Less" => "Menys",
+"Delete" => "Elimina"
+);
diff --git a/apps/tasks/l10n/de.php b/apps/tasks/l10n/de.php
new file mode 100644
index 00000000000..50d0041d209
--- /dev/null
+++ b/apps/tasks/l10n/de.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Datum/Uhrzeit ungültig",
+"Tasks" => "Aufgaben",
+"No category" => "Keine Kategorie",
+"Unspecified" => "Nicht angegeben",
+"1=highest" => "1=am höchsten",
+"5=medium" => "5=Durchschnitt",
+"9=lowest" => "9=am niedrigsten",
+"Empty Summary" => "Leere Zusammenfassung",
+"Invalid percent complete" => "Ungültige Prozent abgeschlossen",
+"Invalid priority" => "Falsche Priorität",
+"Add Task" => "Aufgabe hinzufügen",
+"Order Due" => "Nach Fälligkeit sortieren",
+"Order List" => "Nach Kategorie sortieren ",
+"Order Complete" => "Nach Fertigstellung sortieren",
+"Order Location" => "Nach Ort sortieren",
+"Order Priority" => "Nach Priorität sortieren",
+"Order Label" => "Nach Label sortieren",
+"Loading tasks..." => "Lade Aufgaben...",
+"Important" => "Wichtig",
+"More" => "Mehr",
+"Less" => "Weniger",
+"Delete" => "Löschen"
+);
diff --git a/apps/tasks/l10n/fr.php b/apps/tasks/l10n/fr.php
new file mode 100644
index 00000000000..0bac4a65775
--- /dev/null
+++ b/apps/tasks/l10n/fr.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "date/heure invalide",
+"Tasks" => "Tâches",
+"No category" => "Sans catégorie",
+"Unspecified" => "Non spécifié",
+"1=highest" => "1=le plus important",
+"5=medium" => "5=importance moyenne",
+"9=lowest" => "9=le moins important",
+"Empty Summary" => "Résumé vide",
+"Invalid percent complete" => "Pourcentage d'achèvement invalide",
+"Invalid priority" => "Priorité invalide",
+"Add Task" => "Ajouter une tâche",
+"Loading tasks..." => "Chargement des tâches…",
+"Important" => "Important",
+"More" => "Plus",
+"Less" => "Moins",
+"Delete" => "Supprimer"
+);
diff --git a/apps/tasks/l10n/it.php b/apps/tasks/l10n/it.php
new file mode 100644
index 00000000000..8467ff54eb7
--- /dev/null
+++ b/apps/tasks/l10n/it.php
@@ -0,0 +1,15 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Ora/Data non valida",
+"Tasks" => "Attività",
+"No category" => "Nessuna categoria",
+"Unspecified" => "Non specificata",
+"1=highest" => "1=massima",
+"5=medium" => "5=media",
+"9=lowest" => "9=minima",
+"Invalid percent complete" => "Percentuale di completamento non valida",
+"Invalid priority" => "Priorità non valida",
+"Add Task" => "Aggiungi attività",
+"Loading tasks..." => "Caricamento attività in corso...",
+"Important" => "Importante",
+"Delete" => "Elimina"
+);
diff --git a/apps/tasks/l10n/ro.php b/apps/tasks/l10n/ro.php
new file mode 100644
index 00000000000..54958582f5b
--- /dev/null
+++ b/apps/tasks/l10n/ro.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Data/timpul invalid",
+"Tasks" => "Sarcini",
+"No category" => "Fără categorie",
+"Unspecified" => "Nespecificat",
+"1=highest" => "1=cel mai înalt",
+"5=medium" => "5=mediu",
+"9=lowest" => "9=cel mai jos",
+"Empty Summary" => "Rezumat gol",
+"Invalid percent complete" => "Completare procentuală greșită",
+"Invalid priority" => "Prioritare greșită",
+"Add Task" => "Adaugă sarcină",
+"Order Due" => "Comandă până la",
+"Order List" => "Lista de comenzi",
+"Order Complete" => "Comandă executată",
+"Order Location" => "Locația comenzii",
+"Order Priority" => "Prioritarea comenzii",
+"Order Label" => "Eticheta comenzii",
+"Loading tasks..." => "Încărcare sarcini",
+"Important" => "Important",
+"More" => "Mai mult",
+"Less" => "Mai puțin",
+"Delete" => "Șterge"
+);
diff --git a/apps/tasks/l10n/sl.php b/apps/tasks/l10n/sl.php
new file mode 100644
index 00000000000..7bef1894d1a
--- /dev/null
+++ b/apps/tasks/l10n/sl.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Neveljaven datum/čas",
+"Tasks" => "Opravila",
+"No category" => "Ni kategorije",
+"Unspecified" => "Nedoločen",
+"1=highest" => "1=najvišje",
+"5=medium" => "5=srednje",
+"9=lowest" => "9=najnižje",
+"Empty Summary" => "Prazen povzetek",
+"Invalid priority" => "Neveljavna prednost",
+"Add Task" => "Dodaj opravilo",
+"More" => "Več",
+"Less" => "Manj"
+);
diff --git a/apps/tasks/l10n/sv.php b/apps/tasks/l10n/sv.php
new file mode 100644
index 00000000000..33bab14448f
--- /dev/null
+++ b/apps/tasks/l10n/sv.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Felaktigt datum/tid",
+"Tasks" => "Uppgifter",
+"No category" => "Ingen kategori",
+"Unspecified" => "Ospecificerad ",
+"1=highest" => "1=högsta",
+"5=medium" => "5=mellan",
+"9=lowest" => "9=lägsta",
+"Empty Summary" => "Tom sammanfattning",
+"Invalid percent complete" => "Ogiltig andel procent klar",
+"Invalid priority" => "Felaktig prioritet",
+"Add Task" => "Lägg till uppgift",
+"Order Due" => "Förfaller",
+"Order List" => "Kategori",
+"Order Complete" => "Slutförd",
+"Order Location" => "Plats",
+"Order Priority" => "Prioritet",
+"Order Label" => "Etikett",
+"Loading tasks..." => "Laddar uppgifter...",
+"Important" => "Viktigt",
+"More" => "Mer",
+"Less" => "Mindre",
+"Delete" => "Radera"
+);
diff --git a/apps/tasks/l10n/th_TH.php b/apps/tasks/l10n/th_TH.php
new file mode 100644
index 00000000000..e4212bf291c
--- /dev/null
+++ b/apps/tasks/l10n/th_TH.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "วันที่ / เวลา ไม่ถูกต้อง",
+"Tasks" => "งาน",
+"No category" => "ไม่มีหมวดหมู่",
+"Unspecified" => "ยังไม่ได้ระบุ",
+"1=highest" => "1=สูงสุด",
+"5=medium" => "5=ปานกลาง",
+"9=lowest" => "9=ต่ำสุด",
+"Empty Summary" => "ข้อมูลสรุปยังว่างอยู่",
+"Invalid percent complete" => "สัดส่วนเปอร์เซ็นต์ความสมบูรณ์ไม่ถูกต้อง",
+"Invalid priority" => "ความสำคัญไม่ถูกต้อง",
+"Add Task" => "เพิ่มงานใหม่",
+"Order Due" => "จัดเรียงตามกำหนดเวลา",
+"Order List" => "จัดเรียงตามรายชื่อ",
+"Order Complete" => "จัดเรียงตามความสมบูรณ์",
+"Order Location" => "จัดเรียงตามตำแหน่งที่อยู่",
+"Order Priority" => "จัดเรียงตามระดับความสำคัญ",
+"Order Label" => "จัดเรียงตามป้ายชื่อ",
+"Loading tasks..." => "กำลังโหลดข้อมูลงาน...",
+"Important" => "สำคัญ",
+"More" => "มาก",
+"Less" => "น้อย",
+"Delete" => "ลบ"
+);
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index aff25593ef7..709144539e9 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -133,12 +133,17 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
 	 */
-	public function usersInGroup($gid) {
+	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		if(!$this->enabled) {
 			return array();
 		}
+		$this->groupSearch = $search;
 		if($this->connection->isCached('usersInGroup'.$gid)) {
-			return $this->connection->getFromCache('usersInGroup'.$gid);
+			$groupUsers = $this->connection->getFromCache('usersInGroup'.$gid);
+			if(!empty($this->groupSearch)) {
+				$groupUsers = array_filter($groupUsers, array($this, 'groupMatchesFilter'));
+			}
+			return array_slice($groupUsers, $offset, $limit);
 		}
 
 		$groupDN = $this->groupname2dn($gid);
@@ -176,7 +181,11 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 		$groupUsers = array_unique($result, SORT_LOCALE_STRING);
 		$this->connection->writeToCache('usersInGroup'.$gid, $groupUsers);
 
-		return $groupUsers;
+		if(!empty($this->groupSearch)) {
+			$groupUsers = array_filter($groupUsers, array($this, 'groupMatchesFilter'));
+		}
+		return array_slice($groupUsers, $offset, $limit);
+
 	}
 
 	/**
@@ -185,18 +194,27 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 	 *
 	 * Returns a list with all groups
 	 */
-	public function getGroups() {
+	public function getGroups($search = '', $limit = -1, $offset = 0) {
 		if(!$this->enabled) {
 			return array();
 		}
+
 		if($this->connection->isCached('getGroups')) {
-			return $this->connection->getFromCache('getGroups');
+			$ldap_groups = $this->connection->getFromCache('getGroups');
+		} else {
+			$ldap_groups = $this->fetchListOfGroups($this->connection->ldapGroupFilter, array($this->connection->ldapGroupDisplayName, 'dn'));
+			$ldap_groups = $this->ownCloudGroupNames($ldap_groups);
+			$this->connection->writeToCache('getGroups', $ldap_groups);
+		}
+		$this->groupSearch = $search;
+		if(!empty($this->groupSearch)) {
+			$ldap_groups = array_filter($ldap_groups, array($this, 'groupMatchesFilter'));
 		}
-		$ldap_groups = $this->fetchListOfGroups($this->connection->ldapGroupFilter, array($this->connection->ldapGroupDisplayName, 'dn'));
-		$ldap_groups = $this->ownCloudGroupNames($ldap_groups);
-		$this->connection->writeToCache('getGroups', $ldap_groups);
+		return array_slice($ldap_groups, $offset, $limit);
+	}
 
-		return $ldap_groups;
+	public function groupMatchesFilter($group) {
+		return (strripos($group, $this->groupSearch) !== false);
 	}
 
 	/**
diff --git a/apps/user_ldap/l10n/.gitkeep b/apps/user_ldap/l10n/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/apps/user_ldap/l10n/.gitkeep
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
new file mode 100644
index 00000000000..04b0f8997db
--- /dev/null
+++ b/apps/user_ldap/l10n/ca.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Màquina",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://",
+"Base DN" => "DN Base",
+"You can specify Base DN for users and groups in the Advanced tab" => "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat",
+"User DN" => "DN Usuari",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "La DN de l'usuari client amb la que s'haurà de fer, per exemple uid=agent,dc=exemple,dc=com. Per un accés anònim, deixeu la DN i la contrasenya en blanc.",
+"Password" => "Contrasenya",
+"For anonymous access, leave DN and Password empty." => "Per un accés anònim, deixeu la DN i la contrasenya en blanc.",
+"User Login Filter" => "Filtre d'inici de sessió d'usuari",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Defineix el filtre a aplicar quan s'intenta l'inici de sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "useu el paràmetre de substitució %%uid, per exemple \"uid=%%uid\"",
+"User List Filter" => "Llista de filtres d'usuari",
+"Defines the filter to apply, when retrieving users." => "Defineix el filtre a aplicar quan es mostren usuaris",
+"without any placeholder, e.g. \"objectClass=person\"." => "sense cap paràmetre de substitució, per exemple \"objectClass=persona\"",
+"Group Filter" => "Filtre de grup",
+"Defines the filter to apply, when retrieving groups." => "Defineix el filtre a aplicar quan es mostren grups.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sense cap paràmetre de substitució, per exemple \"objectClass=grupPosix\".",
+"Port" => "Port",
+"Base User Tree" => "Arbre base d'usuaris",
+"Base Group Tree" => "Arbre base de grups",
+"Group-Member association" => "Associació membres-grup",
+"Use TLS" => "Usa TLS",
+"Do not use it for SSL connections, it will fail." => "No ho useu en connexions SSL, fallarà.",
+"Case insensitve LDAP server (Windows)" => "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)",
+"Turn off SSL certificate validation." => "Desactiva la validació de certificat SSL.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la connexió només funciona amb aquesta opció, importeu el certificat SSL del servidor LDAP en el vostre servidor ownCloud.",
+"Not recommended, use for testing only." => "No recomanat, ús només per proves.",
+"User Display Name Field" => "Camp per mostrar el nom d'usuari",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "Atribut LDAP a usar per generar el nom d'usuari ownCloud.",
+"Group Display Name Field" => "Camp per mostrar el nom del grup",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atribut LDAP a usar per generar el nom de grup ownCloud.",
+"in bytes" => "en bytes",
+"in seconds. A change empties the cache." => "en segons. Un canvi buidarà la memòria de cau.",
+"Help" => "Ajuda"
+);
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
new file mode 100644
index 00000000000..f52bfe8e7e9
--- /dev/null
+++ b/apps/user_ldap/l10n/de.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Host",
+"Password" => "Passwort",
+"User Login Filter" => "Benutzer Login Filter",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch.",
+"User List Filter" => "Benutzer Filter Liste",
+"Group Filter" => "Gruppen Filter",
+"Port" => "Port",
+"Do not use it for SSL connections, it will fail." => "Verwenden Sie es nicht für SSL-Verbindungen, wird es scheitern.",
+"Turn off SSL certificate validation." => "Schalte die SSL Zertifikatsprüfung aus.",
+"in bytes" => "in bytes",
+"in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.",
+"Help" => "Hilfe"
+);
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
new file mode 100644
index 00000000000..c2222f104ed
--- /dev/null
+++ b/apps/user_ldap/l10n/fr.php
@@ -0,0 +1,30 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Hôte",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
+"Base DN" => "DN de base",
+"You can specify Base DN for users and groups in the Advanced tab" => "Vous pouvez spécifier le DN de base pour les utilisateurs et les groupes dans l'onglet Avancé",
+"User DN" => "DN Utilisateur",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Le DN de l'utilisateur client avec lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour l'accès anonyme, laisser le DN et le mot de passe vides.",
+"Password" => "Mot de passe",
+"For anonymous access, leave DN and Password empty." => "Pour l'accès anonyme, laisser le DN et le mot de passe vides.",
+"User Login Filter" => "Filtre d'identifiants utilisateur",
+"User List Filter" => "Filtre d'utilisateurs",
+"Defines the filter to apply, when retrieving users." => "Définit le filtre à appliquer lors de la récupération des utilisateurs.",
+"without any placeholder, e.g. \"objectClass=person\"." => "sans élément de substitution, par exemple \"objectClass=person\".",
+"Group Filter" => "Filtre de groupes",
+"Defines the filter to apply, when retrieving groups." => "Définit le filtre à appliquer lors de la récupération des groupes.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sans élément de substitution, par exemple \"objectClass=posixGroup\".",
+"Port" => "Port",
+"Group-Member association" => "Association groupe-membre",
+"Use TLS" => "Utiliser TLS",
+"Do not use it for SSL connections, it will fail." => "Ne pas utiliser pour les connexions SSL, car cela échouera.",
+"Case insensitve LDAP server (Windows)" => "Serveur LDAP insensible à la casse (Windows)",
+"Turn off SSL certificate validation." => "Désactiver la validation du certificat SSL",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud.",
+"Not recommended, use for testing only." => "Non recommendé, utilisation pour tests uniquement.",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud",
+"in bytes" => "en octets",
+"in seconds. A change empties the cache." => "en secondes. Tout changement vide le cache.",
+"Help" => "Aide"
+);
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
new file mode 100644
index 00000000000..70c4bf4d082
--- /dev/null
+++ b/apps/user_ldap/l10n/it.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Host",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://",
+"Base DN" => "DN base",
+"You can specify Base DN for users and groups in the Advanced tab" => "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate",
+"User DN" => "DN utente",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agent,dc=example,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
+"Password" => "Password",
+"For anonymous access, leave DN and Password empty." => "Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
+"User Login Filter" => "Filtro per il login utente",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Specifica quale filtro utilizzare quando si tenta il login. %%uid sostituisce il nome utente all'atto del login.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "utilizza il segnaposto %%uid, per esempio \"uid=%%uid\"",
+"User List Filter" => "Filtro per la lista utente",
+"Defines the filter to apply, when retrieving users." => "Specifica quale filtro utilizzare durante il recupero degli utenti.",
+"without any placeholder, e.g. \"objectClass=person\"." => "senza nessun segnaposto, per esempio \"objectClass=person\".",
+"Group Filter" => "Filtro per il gruppo",
+"Defines the filter to apply, when retrieving groups." => "Specifica quale filtro utilizzare durante il recupero dei gruppi.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "senza nessun segnaposto, per esempio \"objectClass=posixGroup\".",
+"Port" => "Porta",
+"Base User Tree" => "Struttura base dell'utente",
+"Base Group Tree" => "Struttura base del gruppo",
+"Group-Member association" => "Associazione gruppo-utente ",
+"Use TLS" => "Usa TLS",
+"Do not use it for SSL connections, it will fail." => "Non utilizzare per le connessioni SSL, fallirà.",
+"Case insensitve LDAP server (Windows)" => "Case insensitve LDAP server (Windows)",
+"Turn off SSL certificate validation." => "Disattiva il controllo del certificato SSL.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud.",
+"Not recommended, use for testing only." => "Non consigliato, utilizzare solo per test.",
+"User Display Name Field" => "Campo per la visualizzazione del nome utente",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "L'attributo LDAP da usare per generare il nome dell'utente ownCloud.",
+"Group Display Name Field" => "Campo per la visualizzazione del nome del gruppo",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "L'attributo LDAP da usare per generare il nome del gruppo ownCloud.",
+"in bytes" => "in byte",
+"in seconds. A change empties the cache." => "in secondi. Il cambio svuota la cache.",
+"Help" => "Aiuto"
+);
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
new file mode 100644
index 00000000000..326e47f96fe
--- /dev/null
+++ b/apps/user_ldap/l10n/ro.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Gazdă",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://",
+"Base DN" => "DN de bază",
+"You can specify Base DN for users and groups in the Advanced tab" => "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat",
+"User DN" => "DN al utilizatorului",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN-ul clientului utilizator cu care se va efectua conectarea, d.e. uid=agent,dc=example,dc=com. Pentru acces anonim, lăsăți DN și Parolă libere.",
+"Password" => "Parolă",
+"For anonymous access, leave DN and Password empty." => "Pentru acces anonim, lăsați DN și Parolă libere.",
+"User Login Filter" => "Filtrare după Nume Utilizator",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definește fitrele care trebuie aplicate, când se încearcă conectarea. %%uid înlocuiește numele utilizatorului în procesul de conectare.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "folosiți substituentul %%uid , d.e. \"uid=%%uid\"",
+"User List Filter" => "Filtrarea după lista utilizatorilor",
+"Defines the filter to apply, when retrieving users." => "Definește filtrele care trebui aplicate, când se peiau utilzatorii.",
+"without any placeholder, e.g. \"objectClass=person\"." => "fără substituenți, d.e. \"objectClass=person\".",
+"Group Filter" => "Fitrare Grup",
+"Defines the filter to apply, when retrieving groups." => "Definește filtrele care se aplică, când se preiau grupurile.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "fără substituenți, d.e. \"objectClass=posixGroup\"",
+"Port" => "Portul",
+"Base User Tree" => "Arborele de bază al Utilizatorilor",
+"Base Group Tree" => "Arborele de bază al Grupurilor",
+"Group-Member association" => "Asocierea Grup-Membru",
+"Use TLS" => "Utilizează TLS",
+"Do not use it for SSL connections, it will fail." => "A nu se utiliza pentru conexiuni SSL, va eșua.",
+"Case insensitve LDAP server (Windows)" => "Server LDAP insensibil la majuscule (Windows)",
+"Turn off SSL certificate validation." => "Oprește validarea certificatelor SSL ",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Dacă conexiunea lucrează doar cu această opțiune, importează certificatul SSL al serverului LDAP în serverul ownCloud.",
+"Not recommended, use for testing only." => "Nu este recomandat, a se utiliza doar pentru testare.",
+"User Display Name Field" => "Câmpul cu numele vizibil al utilizatorului",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "Atributul LDAP folosit pentru a genera numele de utilizator din ownCloud.",
+"Group Display Name Field" => "Câmpul cu numele grupului",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atributul LDAP folosit pentru a genera numele grupurilor din ownCloud",
+"in bytes" => "în octeți",
+"in seconds. A change empties the cache." => "în secunde. O schimbare curăță memoria tampon.",
+"Help" => "Ajutor"
+);
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
new file mode 100644
index 00000000000..a23cc094b4d
--- /dev/null
+++ b/apps/user_ldap/l10n/sv.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Server",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://",
+"Base DN" => "Start DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "Du kan ange start DN för användare och grupper under fliken Avancerat",
+"User DN" => "Användare DN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN för användaren som skall användas, t.ex. uid=agent, dc=example, dc=com. För anonym åtkomst, lämna DN och lösenord tomt.",
+"Password" => "Lösenord",
+"For anonymous access, leave DN and Password empty." => "För anonym åtkomst, lämna DN och lösenord tomt.",
+"User Login Filter" => "Filter logga in användare",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definierar filter att tillämpa vid inloggningsförsök. %% uid ersätter användarnamn i loginåtgärden.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "använd platshållare %%uid, t ex \"uid=%%uid\"",
+"User List Filter" => "Filter lista användare",
+"Defines the filter to apply, when retrieving users." => "Definierar filter att tillämpa vid listning av användare.",
+"without any placeholder, e.g. \"objectClass=person\"." => "utan platshållare, t.ex. \"objectClass=person\".",
+"Group Filter" => "Gruppfilter",
+"Defines the filter to apply, when retrieving groups." => "Definierar filter att tillämpa vid listning av grupper.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "utan platshållare, t.ex. \"objectClass=posixGroup\".",
+"Port" => "Port",
+"Base User Tree" => "Bas för användare i katalogtjänst",
+"Base Group Tree" => "Bas för grupper i katalogtjänst",
+"Group-Member association" => "Attribut för gruppmedlemmar",
+"Use TLS" => "Använd TLS",
+"Do not use it for SSL connections, it will fail." => "Använd inte för SSL-anslutningar, det kommer inte att fungera.",
+"Case insensitve LDAP server (Windows)" => "LDAP-servern är okänslig för gemener och versaler (Windows)",
+"Turn off SSL certificate validation." => "Stäng av verifiering av SSL-certifikat.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Om anslutningen bara fungerar med det här alternativet, importera LDAP-serverns SSL-certifikat i din ownCloud-server.",
+"Not recommended, use for testing only." => "Rekommenderas inte, använd bara för test. ",
+"User Display Name Field" => "Attribut för användarnamn",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "Attribut som används för att generera användarnamn i ownCloud.",
+"Group Display Name Field" => "Attribut för gruppnamn",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "Attribut som används för att generera gruppnamn i ownCloud.",
+"in bytes" => "i bytes",
+"in seconds. A change empties the cache." => "i sekunder. En förändring tömmer cache.",
+"Help" => "Hjälp"
+);
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
new file mode 100644
index 00000000000..8b2e6423ac4
--- /dev/null
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Host" => "โฮสต์",
+"Password" => "รหัสผ่าน",
+"Group Filter" => "ตัวกรองข้อมูลกลุ่ม",
+"Port" => "พอร์ต",
+"Use TLS" => "ใช้ TLS",
+"Not recommended, use for testing only." => "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น",
+"in bytes" => "ในหน่วยไบต์",
+"Help" => "ช่วยเหลือ"
+);
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index fb3471af91b..31b6dccbf67 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -100,14 +100,22 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	 *
 	 * Get a list of all users.
 	 */
-	public function getUsers(){
+	public function getUsers($search = '', $limit = 10, $offset = 0){
 		$ldap_users = $this->connection->getFromCache('getUsers');
 		if(is_null($ldap_users)) {
 			$ldap_users = $this->fetchListOfUsers($this->connection->ldapUserFilter, array($this->connection->ldapUserDisplayName, 'dn'));
 			$ldap_users = $this->ownCloudUserNames($ldap_users);
 			$this->connection->writeToCache('getUsers', $ldap_users);
 		}
-		return $ldap_users;
+		$this->userSearch = $search;
+		if(!empty($this->userSearch)) {
+			$ldap_users = array_filter($ldap_users, array($this, 'userMatchesFilter'));
+		}
+		return array_slice($ldap_users, $offset, $limit);
+	}
+
+	public function userMatchesFilter($user) {
+		return (strripos($user, $this->userSearch) !== false);
 	}
 
 	/**
diff --git a/apps/user_migrate/l10n/.gitkeep b/apps/user_migrate/l10n/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/apps/user_migrate/l10n/.gitkeep
diff --git a/apps/user_migrate/l10n/ca.php b/apps/user_migrate/l10n/ca.php
new file mode 100644
index 00000000000..6e423c01b0b
--- /dev/null
+++ b/apps/user_migrate/l10n/ca.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Exporta",
+"Something went wrong while the export file was being generated" => "Alguna cosa ha anat malament en generar el fitxer d'exportació",
+"An error has occurred" => "S'ha produït un error",
+"Export your user account" => "Exportar el compte d'usuari",
+"This will create a compressed file that contains your ownCloud account." => "Això crearà un fitxer comprimit que conté el vostre compte ownCloud.",
+"Import user account" => "Importar el compte d'usuari",
+"ownCloud User Zip" => "zip d'usuari ownCloud",
+"Import" => "Importa"
+);
diff --git a/apps/user_migrate/l10n/de.php b/apps/user_migrate/l10n/de.php
new file mode 100644
index 00000000000..110b0bba6e6
--- /dev/null
+++ b/apps/user_migrate/l10n/de.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Export",
+"Something went wrong while the export file was being generated" => "Beim Export der Datei ist etwas schief gegangen.",
+"An error has occurred" => "Es ist ein Fehler aufgetreten.",
+"Export your user account" => "Ihr Konto exportieren",
+"This will create a compressed file that contains your ownCloud account." => "Eine komprimierte Datei wird erzeugen, die Ihr ownCloud-Konto enthält.",
+"Import user account" => "Konto importieren",
+"ownCloud User Zip" => "Zip-Archiv mit Benutzerdaten",
+"Import" => "Importieren"
+);
diff --git a/apps/user_migrate/l10n/fr.php b/apps/user_migrate/l10n/fr.php
new file mode 100644
index 00000000000..f1fe46bcacb
--- /dev/null
+++ b/apps/user_migrate/l10n/fr.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Exporter",
+"Something went wrong while the export file was being generated" => "Une erreur s'est produit pendant la génération du fichier d'export",
+"An error has occurred" => "Une erreur s'est produite",
+"Export your user account" => "Exportez votre compte utilisateur",
+"This will create a compressed file that contains your ownCloud account." => "Cette action va créer une archive compressée qui contiendra les données de votre compte ownCloud.",
+"Import user account" => "Importer un compte utilisateur",
+"ownCloud User Zip" => "Archive Zip de l'utilisateur",
+"Import" => "Importer"
+);
diff --git a/apps/user_migrate/l10n/it.php b/apps/user_migrate/l10n/it.php
new file mode 100644
index 00000000000..f3eeb15dab5
--- /dev/null
+++ b/apps/user_migrate/l10n/it.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Esporta",
+"Something went wrong while the export file was being generated" => "Si è verificato un errore durante la creazione del file di esportazione",
+"An error has occurred" => "Si è verificato un errore",
+"Export your user account" => "Esporta il tuo account utente",
+"This will create a compressed file that contains your ownCloud account." => "Questa operazione creerà un file compresso che contiene il tuo account ownCloud.",
+"Import user account" => "Importa account utente",
+"ownCloud User Zip" => "Zip account utente",
+"Import" => "Importa"
+);
diff --git a/apps/user_migrate/l10n/sl.php b/apps/user_migrate/l10n/sl.php
new file mode 100644
index 00000000000..c14bca0f709
--- /dev/null
+++ b/apps/user_migrate/l10n/sl.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Izvozi",
+"Something went wrong while the export file was being generated" => "Med ustvarjanjem datoteke za izvoz je prišlo do napake",
+"An error has occurred" => "Prišlo je do napake",
+"Export your user account" => "Izvozi vaš uporabniški račun",
+"This will create a compressed file that contains your ownCloud account." => "Ustvarjena bo stisnjena datoteka z vašim ownCloud računom.",
+"Import user account" => "Uvozi uporabniški račun",
+"ownCloud User Zip" => "Zip datoteka ownCloud uporabnika",
+"Import" => "Uvozi"
+);
diff --git a/apps/user_migrate/l10n/sv.php b/apps/user_migrate/l10n/sv.php
new file mode 100644
index 00000000000..98e649632b8
--- /dev/null
+++ b/apps/user_migrate/l10n/sv.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Exportera",
+"Something went wrong while the export file was being generated" => "Något gick fel när exportfilen skulle genereras",
+"An error has occurred" => "Ett fel har uppstått",
+"Export your user account" => "Exportera ditt användarkonto",
+"This will create a compressed file that contains your ownCloud account." => "Detta vill skapa en komprimerad fil som innehåller ditt ownCloud-konto.",
+"Import user account" => "Importera ett användarkonto",
+"ownCloud User Zip" => "ownCloud  Zip-fil",
+"Import" => "Importera"
+);
diff --git a/apps/user_migrate/l10n/th_TH.php b/apps/user_migrate/l10n/th_TH.php
new file mode 100644
index 00000000000..d2c36bb4edd
--- /dev/null
+++ b/apps/user_migrate/l10n/th_TH.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "ส่งออก",
+"Something went wrong while the export file was being generated" => "เกิดข้อผิดพลาดบางประการในระหว่างการส่งออกไฟล์",
+"An error has occurred" => "เกิดข้อผิดพลาดบางประการ",
+"Export your user account" => "ส่งออกบัญชีผู้ใช้งานของคุณ",
+"This will create a compressed file that contains your ownCloud account." => "ส่วนนี้จะเป็นการสร้างไฟล์บีบอัดที่บรรจุข้อมูลบัญชีผู้ใช้งาน ownCloud ของคุณ",
+"Import user account" => "นำเข้าบัญชีผู้ใช้งาน",
+"ownCloud User Zip" => "ไฟล์ Zip ผู้ใช้งาน ownCloud",
+"Import" => "นำเข้า"
+);
diff --git a/apps/user_migrate/templates/settings.php b/apps/user_migrate/templates/settings.php
index bce5fb2d7ca..d6f3e2f8f6b 100644
--- a/apps/user_migrate/templates/settings.php
+++ b/apps/user_migrate/templates/settings.php
@@ -2,7 +2,7 @@
 	<legend><strong><?php echo $l->t('Export your user account');?></strong></legend>
 	<p><?php echo $l->t('This will create a compressed file that contains your ownCloud account.');?>
 	</p>
-	<button id="exportbtn">Export<img style="display: none;" class="loading" src="<?php echo OCP\Util::linkTo('core', 'img/loading.gif'); ?>" /></button>
+	<button id="exportbtn">Export<img style="display: none;" class="loading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" /></button>
 </fieldset>
 <form id="import" action="#" method="post" enctype="multipart/form-data">
     <fieldset class="personalblock">
diff --git a/apps/user_openid/l10n/.gitkeep b/apps/user_openid/l10n/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/apps/user_openid/l10n/.gitkeep
diff --git a/apps/user_openid/l10n/ca.php b/apps/user_openid/l10n/ca.php
new file mode 100644
index 00000000000..d203bfb4d9d
--- /dev/null
+++ b/apps/user_openid/l10n/ca.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "Això és un punt final de servidor OpenID. Per més informació consulteu",
+"Identity: <b>" => "Identitat:<b>",
+"Realm: <b>" => "Domini:<b>",
+"User: <b>" => "Usuari:<b>",
+"Login" => "Inici de sessió",
+"Error: <b>No user Selected" => "Error:<b>No heu seleccionat cap usuari",
+"you can authenticate to other sites with this address" => "podeu autenticar altres llocs web amb aquesta adreça",
+"Authorized OpenID provider" => "Servidor OpenID autoritzat",
+"Your address at Wordpress, Identi.ca, &hellip;" => "La vostra adreça a Wordpress, Identi.ca &hellip;"
+);
diff --git a/apps/user_openid/l10n/de.php b/apps/user_openid/l10n/de.php
new file mode 100644
index 00000000000..97abccba9e4
--- /dev/null
+++ b/apps/user_openid/l10n/de.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "Dies ist ein OpenID-Server-Endpunkt. Für weitere Informationen schauen Sie sich folgendes an:",
+"Identity: <b>" => "Identität: <b>",
+"Realm: <b>" => "Bereich: <b>",
+"User: <b>" => "Benutzer: <b>",
+"Login" => "Anmelden",
+"Error: <b>No user Selected" => "Fehler: <b> Kein Benutzer gewählt",
+"you can authenticate to other sites with this address" => "Sie können sich auf anderen Seiten mit dieser Adresse authentifizieren.",
+"Authorized OpenID provider" => "Authorisierter OpenID-Anbieter",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Ihre Adresse bei Wordpress, Identi.ca, &hellip;"
+);
diff --git a/apps/user_openid/l10n/fr.php b/apps/user_openid/l10n/fr.php
new file mode 100644
index 00000000000..ec3d00853d9
--- /dev/null
+++ b/apps/user_openid/l10n/fr.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "Ce serveur est un point d'accès OpenID. Pour plus d'informations, veuillez consulter",
+"Identity: <b>" => "Identité : <b>",
+"Realm: <b>" => "Domaine : <b>",
+"User: <b>" => "Utilisateur : <b>",
+"Login" => "Connexion",
+"Error: <b>No user Selected" => "Erreur : <b>Aucun nom d'utilisateur n'a été saisi",
+"you can authenticate to other sites with this address" => "vous pouvez vous authentifier sur d'autres sites grâce à cette adresse",
+"Authorized OpenID provider" => "Fournisseur d'identité OpenID autorisé",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Votre adresse Wordpress, Identi.ca, &hellip;"
+);
diff --git a/apps/user_openid/l10n/it.php b/apps/user_openid/l10n/it.php
new file mode 100644
index 00000000000..bda06ce18a9
--- /dev/null
+++ b/apps/user_openid/l10n/it.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "Questo è un server OpenID. Per ulteriori informazioni, vedi",
+"Identity: <b>" => "Identità: <b>",
+"Realm: <b>" => "Dominio: <b>",
+"User: <b>" => "Utente: <b>",
+"Login" => "Accesso",
+"Error: <b>No user Selected" => "Errore: <b>nessun utente selezionato",
+"you can authenticate to other sites with this address" => "puoi autenticarti ad altri siti con questo indirizzo",
+"Authorized OpenID provider" => "Fornitore OpenID autorizzato",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Il tuo indirizzo su Wordpress, Identi.ca, &hellip;"
+);
diff --git a/apps/user_openid/l10n/sl.php b/apps/user_openid/l10n/sl.php
new file mode 100644
index 00000000000..72132cd6378
--- /dev/null
+++ b/apps/user_openid/l10n/sl.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "To je OpenID strežniška končna točka. Za več informacij si oglejte",
+"Identity: <b>" => "Istovetnost: <b>",
+"User: <b>" => "Uporabnik:",
+"Login" => "Prijava",
+"Error: <b>No user Selected" => "Napaka: <b>Uporabnik ni bil izbran",
+"you can authenticate to other sites with this address" => "s tem naslovom se lahko overite tudi na drugih straneh",
+"Authorized OpenID provider" => "Odobren OpenID ponudnik",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Vaš naslov na Wordpress, Identi.ca, &hellip;"
+);
diff --git a/apps/user_openid/l10n/sv.php b/apps/user_openid/l10n/sv.php
new file mode 100644
index 00000000000..fb2c4e2ff7e
--- /dev/null
+++ b/apps/user_openid/l10n/sv.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "Detta är en OpenID-server slutpunkt. För mer information, se",
+"Identity: <b>" => "Identitet: <b>",
+"Realm: <b>" => "Realm: <b>",
+"User: <b>" => "Användare: <b>",
+"Login" => "Logga in",
+"Error: <b>No user Selected" => "Fel: <b>Ingen användare vald",
+"you can authenticate to other sites with this address" => "du kan autentisera till andra webbplatser med denna adress",
+"Authorized OpenID provider" => "Godkänd openID leverantör",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Din adress på Wordpress, Identi.ca, &hellip;"
+);
diff --git a/apps/user_openid/l10n/th_TH.php b/apps/user_openid/l10n/th_TH.php
new file mode 100644
index 00000000000..fbf0bbc60a5
--- /dev/null
+++ b/apps/user_openid/l10n/th_TH.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "นี่คือปลายทางของเซิร์ฟเวอร์ OpenID สำหรับรายละเอียดเพิ่มเติม, กรุณาดูที่",
+"Identity: <b>" => "ข้อมูลประจำตัว <b>",
+"Realm: <b>" => "ขอบเขตพื้นที่ <b>",
+"User: <b>" => "ผู้ใช้งาน: <b>",
+"Login" => "เข้าสู่ระบบ",
+"Error: <b>No user Selected" => "พบข้อผิดพลาด <b> ยังไม่ได้เลือกชื่อผู้ใช้งาน",
+"you can authenticate to other sites with this address" => "คุณสามารถได้รับสิทธิ์เพื่อเข้าใช้งานเว็บไซต์อื่นๆโดยใช้ที่อยู่นี้",
+"Authorized OpenID provider" => "ผู้ให้บริการ OpenID ที่ได้รับอนุญาต",
+"Your address at Wordpress, Identi.ca, &hellip;" => "ที่อยู่ของคุณที่ Wordpress, Identi.ca, &hellip;"
+);
diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php
index f06346672ff..b725937948a 100644
--- a/apps/user_webfinger/webfinger.php
+++ b/apps/user_webfinger/webfinger.php
@@ -7,17 +7,17 @@ header("Access-Control-Allow-Origin: *");
 header("Content-Type: application/xrd+json");
 
 /**
- * To include your app in the webfinger XML, add a new script with file name
+ * To include your app in the webfinger JSON, add a new script with file name
  * 'webfinger.php' to /apps/yourapp/appinfo/, which prints out the XML parts
  * to be included. That script can make use of the constants WF_USER (e. g.
  * "user"), WF_ID (user@host) and WF_BASEURL (e. g. https://host/owncloud).
  * An example could look like this:
  * 
- * <Link
- * 	rel="myProfile"
- * 	type="text/html"
- * 	href="<?php echo WF_BASEURL; ?>/apps/myApp/profile.php?user=<?php echo WF_USER; ?>">
- * </Link>
+ * {
+ * 	"rel":"myProfile",
+ * 	"type":"text/html",
+ * 	"href":"<?php echo WF_BASEURL; ?>/apps/myApp/profile.php?user=<?php echo WF_USER; ?>"
+ * }
  *
  * but can also use complex database queries to generate the webfinger result
  **/
diff --git a/core/css/styles.css b/core/css/styles.css
index 7e79a66fb49..dd6f9d4675d 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -160,9 +160,9 @@ a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padd
 #category_addinput { width: 10em; }
 
 /* ---- APP SETTINGS ---- */
-.popup { background-color: white; border-radius: 10px 10px 10px 10px; box-shadow: 0 0 20px #888888; color: #333333; padding: 10px; position: absolute; z-index: 200; }
-.popup.topright { top: -8px; right: 1em; }
-.popup.bottomleft { bottom: 1em; left: 8px; }
+.popup { background-color: white; border-radius: 10px 10px 10px 10px; box-shadow: 0 0 20px #888888; color: #333333; padding: 10px; position: fixed !important; z-index: 200; }
+.popup.topright { top: 7em; right: 1em; }
+.popup.bottomleft { bottom: 1em; left: 33em; }
 .popup .close { position:absolute; top: 0.2em; right:0.2em; height: 20px; width: 20px; background:url('../img/actions/delete.svg') no-repeat center; }
 .popup h2 { font-weight: bold; font-size: 1.2em; }
 .arrow { border-bottom: 10px solid white; border-left: 10px solid transparent; border-right: 10px solid transparent; display: block; height: 0; position: absolute; width: 0; z-index: 201; }
diff --git a/core/js/js.js b/core/js/js.js
index 6881090f62e..7a50b2e7b9d 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -175,39 +175,41 @@ OC={
 		if(settings.length == 0) {
 			throw { name: 'MissingDOMElement', message: 'There has be be an element with id "appsettings" for the popup to show.' };
 		}
-		if(settings.is(':visible')) {
-			settings.hide().find('.arrow').hide();
+		var popup = $('#appsettings_popup');
+		if(popup.length == 0) {
+			$('body').prepend('<div class="popup hidden" id="appsettings_popup"></div>');
+			popup = $('#appsettings_popup');
+			popup.addClass(settings.hasClass('topright') ? 'topright' : 'bottomleft');
+		}
+		if(popup.is(':visible')) {
+			popup.hide().remove();
 		} else {
-			if($('#journal.settings').length == 0) {
-				var arrowclass = settings.hasClass('topright') ? 'up' : 'left';
-				var jqxhr = $.get(OC.filePath(props.appid, '', props.scriptName), function(data) {
-					$('#appsettings').html(data).ready(function() {
-						settings.prepend('<span class="arrow '+arrowclass+'"></span><h2>'+t('core', 'Settings')+'</h2><a class="close svg"></a>').show();
-						settings.find('.close').bind('click', function() {
-							settings.hide();
-						})
-						if(typeof props.loadJS !== 'undefined') {
-							var scriptname;
-							if(props.loadJS === true) {
-								scriptname = 'settings.js';
-							} else if(typeof props.loadJS === 'string') {
-								scriptname = props.loadJS;
-							} else {
-								throw { name: 'InvalidParameter', message: 'The "loadJS" parameter must be either boolean or a string.' };
-							}
-							if(props.cache) {
-								$.ajaxSetup({cache: true});
-							}
-							$.getScript(OC.filePath(props.appid, 'js', scriptname))
-							.fail(function(jqxhr, settings, e) {
-								throw e;
-							});
+			var arrowclass = settings.hasClass('topright') ? 'up' : 'left';
+			var jqxhr = $.get(OC.filePath(props.appid, '', props.scriptName), function(data) {
+				popup.html(data).ready(function() {
+					popup.prepend('<span class="arrow '+arrowclass+'"></span><h2>'+t('core', 'Settings')+'</h2><a class="close svg"></a>').show();
+					popup.find('.close').bind('click', function() {
+						popup.remove();
+					})
+					if(typeof props.loadJS !== 'undefined') {
+						var scriptname;
+						if(props.loadJS === true) {
+							scriptname = 'settings.js';
+						} else if(typeof props.loadJS === 'string') {
+							scriptname = props.loadJS;
+						} else {
+							throw { name: 'InvalidParameter', message: 'The "loadJS" parameter must be either boolean or a string.' };
 						}
-					});
-				}, 'html');
-			} else {
-				settings.show().find('.arrow').show();
-			}
+						if(props.cache) {
+							$.ajaxSetup({cache: true});
+						}
+						$.getScript(OC.filePath(props.appid, 'js', scriptname))
+						.fail(function(jqxhr, settings, e) {
+							throw e;
+						});
+					}
+				}).show();
+			}, 'html');
 		}
 	}
 };
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
new file mode 100644
index 00000000000..770d2b6772d
--- /dev/null
+++ b/core/l10n/zh_CN.GB2312.php
@@ -0,0 +1,64 @@
+<?php $TRANSLATIONS = array(
+"Application name not provided." => "应用程序并没有被提供.",
+"No category to add?" => "没有分类添加了?",
+"This category already exists: " => "这个分类已经存在了:",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "设置",
+"January" => "一月",
+"February" => "二月",
+"March" => "三月",
+"April" => "四月",
+"May" => "五月",
+"June" => "六月",
+"July" => "七月",
+"August" => "八月",
+"September" => "九月",
+"October" => "十月",
+"November" => "十一月",
+"December" => "十二月",
+"Cancel" => "取消",
+"No" => "否",
+"Yes" => "是",
+"Ok" => "好的",
+"No categories selected for deletion." => "没有选者要删除的分类.",
+"Error" => "错误",
+"ownCloud password reset" => "私有云密码重置",
+"Use the following link to reset your password: {link}" => "使用下面的链接来重置你的密码:{link}",
+"You will receive a link to reset your password via Email." => "你将会收到一个重置密码的链接",
+"Requested" => "请求",
+"Login failed!" => "登陆失败!",
+"Username" => "用户名",
+"Request reset" => "要求重置",
+"Your password was reset" => "你的密码已经被重置了",
+"To login page" => "转至登陆页面",
+"New password" => "新密码",
+"Reset password" => "重置密码",
+"Personal" => "个人的",
+"Users" => "用户",
+"Apps" => "应用程序",
+"Admin" => "管理",
+"Help" => "帮助",
+"Access forbidden" => "禁止访问",
+"Cloud not found" => "云 没有被找到",
+"Edit categories" => "编辑分类",
+"Add" => "添加",
+"Create an <strong>admin account</strong>" => "建立一个 <strong>管理帐户</strong>",
+"Password" => "密码",
+"Advanced" => "进阶",
+"Data folder" => "数据存放文件夹",
+"Configure the database" => "配置数据库",
+"will be used" => "将会使用",
+"Database user" => "数据库用户",
+"Database password" => "数据库密码",
+"Database name" => "数据库用户名",
+"Database host" => "数据库主机",
+"Finish setup" => "完成安装",
+"web services under your control" => "你控制下的网络服务",
+"Log out" => "注销",
+"Lost your password?" => "忘记密码?",
+"remember" => "备忘",
+"Log in" => "登陆",
+"You are logged out." => "你已经注销了",
+"prev" => "后退",
+"next" => "前进"
+);
diff --git a/cron.php b/cron.php
index 1e0bb5f6dcd..83285e8a47c 100644
--- a/cron.php
+++ b/cron.php
@@ -47,7 +47,19 @@ if( !OC_Config::getValue( 'installed', false )){
 // Handle unexpected errors
 register_shutdown_function('handleUnexpectedShutdown');
 
+// Exit if background jobs are disabled!
 $appmode = OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' );
+if( $appmode == 'none' ){
+	my_temporary_cron_class::$sent = true;
+	if( OC::$CLI ){
+		echo 'Background Jobs are disabled!'.PHP_EOL;
+	}
+	else{
+		OC_JSON::error( array( 'data' => array( 'message' => 'Background jobs disabled!')));
+	}
+	exit( 1 );
+}
+
 if( OC::$CLI ){
 	if( $appmode != 'cron' ){
 		OC_Appconfig::setValue( 'core', 'backgroundjobs_mode', 'cron' );
diff --git a/l10n/.tx/config b/l10n/.tx/config
index 814fb9a37de..db4df85793c 100644
--- a/l10n/.tx/config
+++ b/l10n/.tx/config
@@ -48,3 +48,63 @@ source_file = templates/lib.pot
 source_lang = en
 type = PO
 
+[owncloud.admin_dependencies_chk]
+file_filter = <lang>/admin_dependencies_chk.po
+source_file = templates/admin_dependencies_chk.pot
+source_lang = en
+type = PO
+
+[owncloud.admin_migrate]
+file_filter = <lang>/admin_migrate.po
+source_file = templates/admin_migrate.pot
+source_lang = en
+type = PO
+
+[owncloud.files_encryption]
+file_filter = <lang>/files_encryption.po
+source_file = templates/files_encryption.pot
+source_lang = en
+type = PO
+
+[owncloud.files_external]
+file_filter = <lang>/files_external.po
+source_file = templates/files_external.pot
+source_lang = en
+type = PO
+
+[owncloud.files_sharing]
+file_filter = <lang>/files_sharing.po
+source_file = templates/files_sharing.pot
+source_lang = en
+type = PO
+
+[owncloud.files_versions]
+file_filter = <lang>/files_versions.po
+source_file = templates/files_versions.pot
+source_lang = en
+type = PO
+
+[owncloud.tasks]
+file_filter = <lang>/tasks.po
+source_file = templates/tasks.pot
+source_lang = en
+type = PO
+
+[owncloud.user_ldap]
+file_filter = <lang>/user_ldap.po
+source_file = templates/user_ldap.pot
+source_lang = en
+type = PO
+
+[owncloud.user_migrate]
+file_filter = <lang>/user_migrate.po
+source_file = templates/user_migrate.pot
+source_lang = en
+type = PO
+
+[owncloud.user_openid]
+file_filter = <lang>/user_openid.po
+source_file = templates/user_openid.pot
+source_lang = en
+type = PO
+
diff --git a/l10n/af/admin_dependencies_chk.po b/l10n/af/admin_dependencies_chk.po
new file mode 100644
index 00000000000..cc514c3f092
--- /dev/null
+++ b/l10n/af/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/af/admin_migrate.po b/l10n/af/admin_migrate.po
new file mode 100644
index 00000000000..6801bee56d5
--- /dev/null
+++ b/l10n/af/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/af/calendar.po b/l10n/af/calendar.po
index 80a29a27bfc..c4363ac1ae7 100644
--- a/l10n/af/calendar.po
+++ b/l10n/af/calendar.po
@@ -7,21 +7,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr ""
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr ""
 
@@ -29,298 +37,392 @@ msgstr ""
 msgid "Wrong calendar"
 msgstr ""
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr ""
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr ""
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr ""
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr ""
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr ""
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr ""
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr ""
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr ""
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr ""
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr ""
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr ""
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr ""
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr ""
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr ""
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr ""
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr ""
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr ""
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr ""
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr ""
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr ""
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr ""
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr ""
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr ""
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr ""
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr ""
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr ""
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr ""
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr ""
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr ""
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr ""
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr ""
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr ""
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr ""
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr ""
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr ""
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr ""
 
-#: templates/calendar.php:11
-msgid "All day"
+#: templates/calendar.php:6
+msgid "Sun."
 msgstr ""
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
+#: templates/calendar.php:11
+msgid "All day"
 msgstr ""
 
 #: templates/calendar.php:13
@@ -356,32 +458,24 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr ""
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr ""
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
 #: templates/part.choosecalendar.php:2
@@ -389,7 +483,7 @@ msgid "Your calendars"
 msgstr ""
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr ""
 
@@ -401,19 +495,19 @@ msgstr ""
 msgid "No shared calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr ""
@@ -499,23 +593,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr ""
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr ""
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr ""
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr ""
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr ""
 
@@ -523,7 +617,7 @@ msgstr ""
 msgid "Location of the Event"
 msgstr ""
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr ""
 
@@ -531,84 +625,86 @@ msgstr ""
 msgid "Description of the Event"
 msgstr ""
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr ""
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr ""
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr ""
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr ""
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr ""
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr ""
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr ""
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
+#: templates/part.import.php:14
+msgid "create a new calendar"
 msgstr ""
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
+#: templates/part.import.php:17
+msgid "Import a calendar file"
 msgstr ""
 
-#: templates/part.import.php:10
-msgid "create a new calendar"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
 msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
+#: templates/part.import.php:44
+msgid "Take an available name!"
 msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
+#: templates/part.import.php:47
+msgid "Import"
 msgstr ""
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr ""
 
@@ -624,44 +720,72 @@ msgstr ""
 msgid "No categories selected"
 msgstr ""
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr ""
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
 msgstr ""
 
 #: templates/share.dropdown.php:20
diff --git a/l10n/af/contacts.po b/l10n/af/contacts.po
index dd7c13d20cb..052edbcaa4e 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -530,7 +534,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
@@ -841,30 +845,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/af/files_encryption.po b/l10n/af/files_encryption.po
new file mode 100644
index 00000000000..ba20608786d
--- /dev/null
+++ b/l10n/af/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/af/files_external.po b/l10n/af/files_external.po
new file mode 100644
index 00000000000..3818f8ed56b
--- /dev/null
+++ b/l10n/af/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/af/files_sharing.po b/l10n/af/files_sharing.po
new file mode 100644
index 00000000000..c30e3dcd428
--- /dev/null
+++ b/l10n/af/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/af/files_versions.po b/l10n/af/files_versions.po
new file mode 100644
index 00000000000..d7b621cc6f3
--- /dev/null
+++ b/l10n/af/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index 0e2a8d0e2f9..6074b2d6701 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -69,11 +69,27 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/af/tasks.po b/l10n/af/tasks.po
new file mode 100644
index 00000000000..ced9b6ce121
--- /dev/null
+++ b/l10n/af/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/af/user_ldap.po b/l10n/af/user_ldap.po
new file mode 100644
index 00000000000..7abe79a5a8a
--- /dev/null
+++ b/l10n/af/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/af/user_migrate.po b/l10n/af/user_migrate.po
new file mode 100644
index 00000000000..f1829f1329f
--- /dev/null
+++ b/l10n/af/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/af/user_openid.po b/l10n/af/user_openid.po
new file mode 100644
index 00000000000..7d05e139876
--- /dev/null
+++ b/l10n/af/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/ar/admin_dependencies_chk.po b/l10n/ar/admin_dependencies_chk.po
new file mode 100644
index 00000000000..cd7fa85a2b2
--- /dev/null
+++ b/l10n/ar/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/ar/admin_migrate.po b/l10n/ar/admin_migrate.po
new file mode 100644
index 00000000000..9dcf129cad3
--- /dev/null
+++ b/l10n/ar/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/ar/calendar.po b/l10n/ar/calendar.po
index ac28bf52235..55906a62ff9 100644
--- a/l10n/ar/calendar.po
+++ b/l10n/ar/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr ""
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr ""
 
@@ -30,300 +38,394 @@ msgstr ""
 msgid "Wrong calendar"
 msgstr "جدول زمني خاطئ"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "التوقيت الجديد"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "تم تغيير المنطقة الزمنية"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "طلب غير مفهوم"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "الجدول الزمني"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "عيد ميلاد"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "عمل"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "إتصال"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "الزبائن"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "المرسل"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "عطلة"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "أفكار"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "رحلة"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "يوبيل"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "إجتماع"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "شيء آخر"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "شخصي"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "مشاريع"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "اسئلة"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "العمل"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "جدول زمني جديد"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "لا يعاد"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "يومي"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "أسبوعي"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "كل نهاية الأسبوع"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "كل اسبوعين"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "شهري"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "سنوي"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "بتاتا"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "حسب تسلسل الحدوث"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "حسب التاريخ"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "حسب يوم الشهر"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "حسب يوم الاسبوع"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "الأثنين"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "الثلاثاء"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "الاربعاء"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "الخميس"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "الجمعه"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "السبت"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "الاحد"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "الاحداث باسبوع الشهر"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "أول"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "ثاني"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "ثالث"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "رابع"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "خامس"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "أخير"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "كانون الثاني"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "شباط"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "آذار"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "نيسان"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "أيار"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "حزيران"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "تموز"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "آب"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "أيلول"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "تشرين الاول"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "تشرين الثاني"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "كانون الاول"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "حسب تاريخ الحدث"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "حسب يوم السنه"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "حسب رقم الاسبوع"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "حسب اليوم و الشهر"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "تاريخ"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "تقويم"
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "كل النهار"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "جدول زمني جديد"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "خانات خالية من المعلومات"
@@ -357,40 +459,32 @@ msgstr "هذا الحدث ينتهي قبل أن يبدأ"
 msgid "There was a database fail"
 msgstr "خطأ في قاعدة البيانات"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "إسبوع"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "شهر"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "قائمة"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "اليوم"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "الجداول الزمنية"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "لم يتم قراءة الملف بنجاح."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "إختر الجدول الزمني الرئيسي"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr ""
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "وصلة CalDav"
 
@@ -402,19 +496,19 @@ msgstr ""
 msgid "No shared calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "تحميل"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "تعديل"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "حذف"
@@ -500,23 +594,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "حدث في يوم كامل"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "من"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "إلى"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "خيارات متقدمة"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "مكان"
 
@@ -524,7 +618,7 @@ msgstr "مكان"
 msgid "Location of the Event"
 msgstr "مكان الحدث"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "مواصفات"
 
@@ -532,84 +626,86 @@ msgstr "مواصفات"
 msgid "Description of the Event"
 msgstr "وصف الحدث"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "إعادة"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "تعديلات متقدمه"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "اختر ايام الاسبوع"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "اختر الايام"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "و التواريخ حسب يوم السنه."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "و الاحداث حسب يوم الشهر."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "اختر الاشهر"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "اختر الاسابيع"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "و الاحداث حسب اسبوع السنه"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "المده الفاصله"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "نهايه"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "الاحداث"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "انشاء جدول زمني جديد"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "أدخل ملف التقويم"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "الرجاء إختر الجدول الزمني"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "انشاء جدول زمني جديد"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "أسم الجدول الزمني الجديد"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "إدخال"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "يتم ادخال الجدول الزمني"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "تم ادخال الجدول الزمني بنجاح"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "إدخال"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "أغلق الحوار"
 
@@ -625,45 +721,73 @@ msgstr ""
 msgid "No categories selected"
 msgstr ""
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "اختر الفئة"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "المنطقة الزمنية"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "راقب دائما تغير التقويم الزمني"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "شكل الوقت"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24 ساعة"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12 ساعة"
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "عنوان لتحديث ال CalDAV الجدول الزمني"
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index 30fcdd04df0..2b79ab09cce 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr "خطء خلال توقيف كتاب العناوين."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -60,7 +60,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr "خطء خلال اضافة معرفه جديده."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -84,11 +84,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "المعلومات الموجودة في ال vCard غير صحيحة. الرجاء إعادة تحديث الصفحة."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "خطء خلال محي الصفه."
 
@@ -100,19 +100,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "خطء خلال تعديل الصفه."
 
@@ -161,19 +161,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -531,7 +535,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "حذف"
 
@@ -842,30 +846,30 @@ msgstr ""
 msgid "Download"
 msgstr "انزال"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "تعديل"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "كتاب عناوين جديد"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "حفظ"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "الغاء"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po
new file mode 100644
index 00000000000..18f508df5b4
--- /dev/null
+++ b/l10n/ar/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
new file mode 100644
index 00000000000..c0dcac27be9
--- /dev/null
+++ b/l10n/ar/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
new file mode 100644
index 00000000000..e96e0f5ef97
--- /dev/null
+++ b/l10n/ar/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/ar/files_versions.po b/l10n/ar/files_versions.po
new file mode 100644
index 00000000000..de2471bc46e
--- /dev/null
+++ b/l10n/ar/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index a1a0699c38a..abf56cce11c 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,27 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/ar/tasks.po b/l10n/ar/tasks.po
new file mode 100644
index 00000000000..baa311388ff
--- /dev/null
+++ b/l10n/ar/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
new file mode 100644
index 00000000000..fc345689568
--- /dev/null
+++ b/l10n/ar/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/ar/user_migrate.po b/l10n/ar/user_migrate.po
new file mode 100644
index 00000000000..6a29ae80a3d
--- /dev/null
+++ b/l10n/ar/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/ar/user_openid.po b/l10n/ar/user_openid.po
new file mode 100644
index 00000000000..7063958b173
--- /dev/null
+++ b/l10n/ar/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/ar_SA/admin_dependencies_chk.po b/l10n/ar_SA/admin_dependencies_chk.po
new file mode 100644
index 00000000000..defa48d8f6f
--- /dev/null
+++ b/l10n/ar_SA/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/ar_SA/admin_migrate.po b/l10n/ar_SA/admin_migrate.po
new file mode 100644
index 00000000000..04ac5b2dfb1
--- /dev/null
+++ b/l10n/ar_SA/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/ar_SA/calendar.po b/l10n/ar_SA/calendar.po
index 32a7e56e62d..8229289fd36 100644
--- a/l10n/ar_SA/calendar.po
+++ b/l10n/ar_SA/calendar.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -69,31 +69,30 @@ msgstr ""
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
@@ -218,7 +217,7 @@ msgstr ""
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
@@ -242,7 +241,7 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
@@ -459,32 +458,24 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:44
-msgid "Today"
-msgstr ""
-
 #: templates/calendar.php:45
-msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
+msgid "Today"
 msgstr ""
 
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
 #: templates/part.choosecalendar.php:2
@@ -737,55 +728,63 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/ar_SA/contacts.po b/l10n/ar_SA/contacts.po
index 5fdd6a7ff93..b9c9e90a503 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -530,7 +534,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
@@ -841,30 +845,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/ar_SA/files_encryption.po b/l10n/ar_SA/files_encryption.po
new file mode 100644
index 00000000000..92f87d5baee
--- /dev/null
+++ b/l10n/ar_SA/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/ar_SA/files_external.po b/l10n/ar_SA/files_external.po
new file mode 100644
index 00000000000..faa597d0f4c
--- /dev/null
+++ b/l10n/ar_SA/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/ar_SA/files_sharing.po b/l10n/ar_SA/files_sharing.po
new file mode 100644
index 00000000000..426f4c04230
--- /dev/null
+++ b/l10n/ar_SA/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/ar_SA/files_versions.po b/l10n/ar_SA/files_versions.po
new file mode 100644
index 00000000000..0b3630c5046
--- /dev/null
+++ b/l10n/ar_SA/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
index 0d745bafa6e..a6637ba21a0 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -69,11 +69,27 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/ar_SA/tasks.po b/l10n/ar_SA/tasks.po
new file mode 100644
index 00000000000..69ac800c5e7
--- /dev/null
+++ b/l10n/ar_SA/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ar_SA/user_ldap.po b/l10n/ar_SA/user_ldap.po
new file mode 100644
index 00000000000..92a90a4f3b0
--- /dev/null
+++ b/l10n/ar_SA/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/ar_SA/user_migrate.po b/l10n/ar_SA/user_migrate.po
new file mode 100644
index 00000000000..c49cdec6c68
--- /dev/null
+++ b/l10n/ar_SA/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/ar_SA/user_openid.po b/l10n/ar_SA/user_openid.po
new file mode 100644
index 00000000000..bf485303a2e
--- /dev/null
+++ b/l10n/ar_SA/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/bg_BG/admin_dependencies_chk.po b/l10n/bg_BG/admin_dependencies_chk.po
new file mode 100644
index 00000000000..a90db6fe74f
--- /dev/null
+++ b/l10n/bg_BG/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/bg_BG/admin_migrate.po b/l10n/bg_BG/admin_migrate.po
new file mode 100644
index 00000000000..75812340454
--- /dev/null
+++ b/l10n/bg_BG/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/bg_BG/calendar.po b/l10n/bg_BG/calendar.po
index b07eef2d00b..856d98f8e43 100644
--- a/l10n/bg_BG/calendar.po
+++ b/l10n/bg_BG/calendar.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-30 09:51+0000\n"
-"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "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"
@@ -71,31 +71,30 @@ msgstr "Невалидна заявка"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Календар"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
@@ -220,7 +219,7 @@ msgstr ""
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Понеделник"
 
@@ -244,7 +243,7 @@ msgstr "Петък"
 msgid "Saturday"
 msgstr "Събота"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Неделя"
 
@@ -461,33 +460,25 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Седмица"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Месец"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Списък"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Днес"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Календари"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Възникна проблем с разлистването на файла."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Изберете активен календар"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -739,55 +730,63 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Часова зона"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Първи ден на седмицата"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index aa2426a6ada..c76da91d867 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -530,7 +534,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
@@ -841,30 +845,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/bg_BG/files_encryption.po b/l10n/bg_BG/files_encryption.po
new file mode 100644
index 00000000000..0db200dba5a
--- /dev/null
+++ b/l10n/bg_BG/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
new file mode 100644
index 00000000000..fcc676908d2
--- /dev/null
+++ b/l10n/bg_BG/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
new file mode 100644
index 00000000000..0682eb7965b
--- /dev/null
+++ b/l10n/bg_BG/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/bg_BG/files_versions.po b/l10n/bg_BG/files_versions.po
new file mode 100644
index 00000000000..40a5fc5e9bf
--- /dev/null
+++ b/l10n/bg_BG/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 207c9d4e86c..cfa402cb998 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -72,11 +72,27 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/bg_BG/tasks.po b/l10n/bg_BG/tasks.po
new file mode 100644
index 00000000000..3f26e086ecc
--- /dev/null
+++ b/l10n/bg_BG/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
new file mode 100644
index 00000000000..8b8f5723ced
--- /dev/null
+++ b/l10n/bg_BG/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/bg_BG/user_migrate.po b/l10n/bg_BG/user_migrate.po
new file mode 100644
index 00000000000..37fb22aebf7
--- /dev/null
+++ b/l10n/bg_BG/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/bg_BG/user_openid.po b/l10n/bg_BG/user_openid.po
new file mode 100644
index 00000000000..be71873b642
--- /dev/null
+++ b/l10n/bg_BG/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/ca/admin_dependencies_chk.po b/l10n/ca/admin_dependencies_chk.po
new file mode 100644
index 00000000000..1c5aef0e667
--- /dev/null
+++ b/l10n/ca/admin_dependencies_chk.po
@@ -0,0 +1,74 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 18:28+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr "El mòdul php-json és necessari per moltes aplicacions per comunicacions internes"
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr "El mòdul php-curl és necessari per mostrar el títol de la pàgina quan s'afegeixen adreces d'interès"
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr "El mòdul php-gd és necessari per generar miniatures d'imatges"
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr "El mòdul php-ldap és necessari per connectar amb el servidor ldap"
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr "El mòdul php-zip és necessari per baixar múltiples fitxers de cop"
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr "El mòdul php-mb_multibyte és necessari per gestionar correctament la codificació."
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr "El mòdul php-ctype és necessari per validar dades."
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr "El mòdul php-xml és necessari per compatir els fitxers amb webdav."
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr "La directiva allow_url_fopen de php.ini hauria d'establir-se en 1 per accedir a la base de coneixements dels servidors OCS"
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr "El mòdul php-pdo és necessari per desar les dades d'ownCloud en una base de dades."
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr "Estat de dependències"
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr "Usat per:"
diff --git a/l10n/ca/admin_migrate.po b/l10n/ca/admin_migrate.po
new file mode 100644
index 00000000000..285f752c6ad
--- /dev/null
+++ b/l10n/ca/admin_migrate.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 18:22+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr "Exporta aquesta instància de ownCloud"
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr "Això crearà un fitxer comprimit amb les dades d'aquesta instància ownCloud.\n            Escolliu el tipus d'exportació:"
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr "Exporta"
diff --git a/l10n/ca/calendar.po b/l10n/ca/calendar.po
index e5c6761343f..3976c559bb6 100644
--- a/l10n/ca/calendar.po
+++ b/l10n/ca/calendar.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-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 06:17+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 11:20+0000\n"
 "Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -71,31 +71,30 @@ msgstr "Sol.licitud no vàlida"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendari"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr "ddd d/M"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr "dddd d/M"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d [MMM ][yyyy ]{'&#8212;' d MMM yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr "dddd, d MMM, yyyy"
 
@@ -220,7 +219,7 @@ msgstr "per dia del mes"
 msgid "by weekday"
 msgstr "per dia de la setmana"
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Dilluns"
 
@@ -244,7 +243,7 @@ msgstr "Divendres"
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Diumenge"
 
@@ -461,33 +460,25 @@ msgstr "L'esdeveniment acaba abans que comenci"
 msgid "There was a database fail"
 msgstr "Hi ha un error de base de dades"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Setmana"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mes"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Llista"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Avui"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Calendaris"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "S'ha produït un error en analitzar el fitxer."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Seleccioneu calendaris actius"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr "Configuració"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -739,55 +730,63 @@ msgstr "de"
 msgid "at"
 msgstr "a"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr "General"
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Zona horària"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Comprova sempre en els canvis de zona horària"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr "Actualitza la zona horària automàticament"
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Format de temps"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr "Format horari"
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Primer dia de la setmana"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr "Comença la setmana en "
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr "Memòria de cau"
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr "Neteja la memòria de cau pels esdeveniments amb repetició"
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr "URLs"
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr "Adreça de sincronització del calendari CalDAV"
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr "més informació"
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr "Adreça primària (Kontact et al)"
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr "IOS/OS X"
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr "Enllaç(os) iCalendar només de lectura"
 
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index 4209c7a3537..4db2c47811c 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 11:14+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Error en (des)activar la llibreta d'adreces."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "no s'ha establert la id."
 
@@ -61,7 +61,7 @@ msgstr "No s'han trobat contactes."
 msgid "There was an error adding the contact."
 msgstr "S'ha produït un error en afegir el contacte."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "no s'ha establert el nom de l'element."
 
@@ -85,11 +85,11 @@ msgstr "Esteu intentant afegir una propietat duplicada:"
 msgid "Error adding contact property: "
 msgstr "Error en afegir la propietat del contacte:"
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "La informació de la vCard és incorrecta. Carregueu la pàgina de nou."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Error en eliminar la propietat del contacte."
 
@@ -101,19 +101,19 @@ msgstr "Falta la ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Error en analitzar la ID de la VCard: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "no s'ha establert la suma de verificació."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Alguna cosa ha anat FUBAR."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Error en actualitzar la propietat del contacte."
 
@@ -162,19 +162,19 @@ msgstr "Error en obtenir la propietat PHOTO."
 msgid "Error saving contact."
 msgstr "Error en desar el contacte."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Error en modificar la mida de la imatge"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Error en retallar la imatge"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Error en crear la imatge temporal"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Error en trobar la imatge:"
 
@@ -274,6 +274,10 @@ msgid ""
 "on this server."
 msgstr "El fitxer que intenteu pujar excedeix la mida màxima de pujada en aquest servidor."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr "Error en carregar la imatge de perfil."
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Seleccioneu un tipus"
@@ -476,11 +480,11 @@ msgstr "Expandeix/col·lapsa la llibreta d'adreces"
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Llibreta d'adreces següent"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Llibreta d'adreces anterior"
 
 #: templates/index.php:54
 msgid "Actions"
@@ -532,7 +536,7 @@ msgstr "Edita detalls del nom"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Suprimeix"
 
@@ -843,30 +847,30 @@ msgstr "Mostra l'enllaç VCF només de lectura"
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Edita"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nova llibreta d'adreces"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr "Nom"
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr "Descripció"
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Desa"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr "Més..."
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
new file mode 100644
index 00000000000..98571697a6a
--- /dev/null
+++ b/l10n/ca/files_encryption.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 18:30+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr "Encriptatge"
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr "Exclou els tipus de fitxers següents de l'encriptatge"
+
+#: templates/settings.php:5
+msgid "None"
+msgstr "Cap"
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr "Activa l'encriptatge"
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
new file mode 100644
index 00000000000..8bc7ba3b00f
--- /dev/null
+++ b/l10n/ca/files_external.po
@@ -0,0 +1,83 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 18:33+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr "Emmagatzemament extern"
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr "Punt de muntatge"
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr "Dorsal"
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr "Configuració"
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr "Options"
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr "Aplicable"
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr "Afegeix punt de muntatge"
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr "Cap d'establert"
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr "Tots els usuaris"
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr "Grups"
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr "Usuaris"
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr "Elimina"
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr "Certificats SSL root"
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr "Importa certificat root"
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr "Habilita l'emmagatzemament extern d'usuari"
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr "Permet als usuaris muntar el seu emmagatzemament extern propi"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
new file mode 100644
index 00000000000..e4bd92a4998
--- /dev/null
+++ b/l10n/ca/files_sharing.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 18:21+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr "Els vostres fitxers compartits"
+
+#: templates/list.php:6
+msgid "Item"
+msgstr "Element"
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr "Compartit amb"
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr "Permisos"
+
+#: templates/list.php:16
+msgid "Read"
+msgstr "Llegeix"
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr "Edita"
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Elimina"
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr "Permet compartir amb tercers"
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr "Permet als usuaris compartir fitxers que no són seus"
diff --git a/l10n/ca/files_versions.po b/l10n/ca/files_versions.po
new file mode 100644
index 00000000000..d0555a50f12
--- /dev/null
+++ b/l10n/ca/files_versions.po
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 18:18+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr "Expira totes les versions"
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr "Habilita les versions de fitxers"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 4157d36cb19..703474cad95 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/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-08-07 02:05+0200\n"
-"PO-Revision-Date: 2012-08-06 07:32+0000\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 08:06+0000\n"
 "Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -71,17 +71,33 @@ msgstr "Català"
 msgid "Security Warning"
 msgstr "Avís de seguretat"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr "Cron"
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr "executa una tasca en carregar cada pàgina"
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr "cron.php està registrat en un servei web cron"
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr "usa el servei cron del sistema"
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Registre"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Més"
 
 #: templates/apps.php:10
 msgid "Add your App"
-msgstr "Afegeiu la vostra aplicació"
+msgstr "Afegiu la vostra aplicació"
 
 #: templates/apps.php:26
 msgid "Select an App"
diff --git a/l10n/ca/tasks.po b/l10n/ca/tasks.po
new file mode 100644
index 00000000000..b96519e57fa
--- /dev/null
+++ b/l10n/ca/tasks.po
@@ -0,0 +1,107 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 18:37+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr "data/hora incorrecta"
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr "Tasques"
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr "Cap categoria"
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr "Sense especificar"
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr "1=major"
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr "5=mitjana"
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr "9=inferior"
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr "Elimina el resum"
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr "Percentatge completat no vàlid"
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr "Prioritat no vàlida"
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr "Afegeix una tasca"
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr "Ordena per"
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr "Ordena per llista"
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr "Ordena els complets"
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr "Ordena per ubicació"
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr "Ordena per prioritat"
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr "Ordena per etiqueta"
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr "Carregant les tasques..."
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr "Important"
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr "Més"
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr "Menys"
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr "Elimina"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
new file mode 100644
index 00000000000..9261cd06e5b
--- /dev/null
+++ b/l10n/ca/user_ldap.po
@@ -0,0 +1,165 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 18:54+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr "Màquina"
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://"
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr "DN Base"
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat"
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr "DN Usuari"
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr "La DN de l'usuari client amb la que s'haurà de fer, per exemple uid=agent,dc=exemple,dc=com. Per un accés anònim, deixeu la DN i la contrasenya en blanc."
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr "Contrasenya"
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr "Per un accés anònim, deixeu la DN i la contrasenya en blanc."
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr "Filtre d'inici de sessió d'usuari"
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr "Defineix el filtre a aplicar quan s'intenta l'inici de sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió."
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr "useu el paràmetre de substitució %%uid, per exemple \"uid=%%uid\""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr "Llista de filtres d'usuari"
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr "Defineix el filtre a aplicar quan es mostren usuaris"
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=persona\""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr "Filtre de grup"
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr "Defineix el filtre a aplicar quan es mostren grups."
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=grupPosix\"."
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr "Port"
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr "Arbre base d'usuaris"
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr "Arbre base de grups"
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr "Associació membres-grup"
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr "Usa TLS"
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr "No ho useu en connexions SSL, fallarà."
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)"
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr "Desactiva la validació de certificat SSL."
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr "Si la connexió només funciona amb aquesta opció, importeu el certificat SSL del servidor LDAP en el vostre servidor ownCloud."
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr "No recomanat, ús només per proves."
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr "Camp per mostrar el nom d'usuari"
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr "Atribut LDAP a usar per generar el nom d'usuari ownCloud."
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr "Camp per mostrar el nom del grup"
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr "Atribut LDAP a usar per generar el nom de grup ownCloud."
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr "en bytes"
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr "en segons. Un canvi buidarà la memòria de cau."
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr "Ajuda"
diff --git a/l10n/ca/user_migrate.po b/l10n/ca/user_migrate.po
new file mode 100644
index 00000000000..c603e775e46
--- /dev/null
+++ b/l10n/ca/user_migrate.po
@@ -0,0 +1,52 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 08:04+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr "Exporta"
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr "Alguna cosa ha anat malament en generar el fitxer d'exportació"
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr "S'ha produït un error"
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr "Exportar el compte d'usuari"
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr "Això crearà un fitxer comprimit que conté el vostre compte ownCloud."
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr "Importar el compte d'usuari"
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr "zip d'usuari ownCloud"
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr "Importa"
diff --git a/l10n/ca/user_openid.po b/l10n/ca/user_openid.po
new file mode 100644
index 00000000000..35c53f5627f
--- /dev/null
+++ b/l10n/ca/user_openid.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <rcalvoi@yahoo.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 18:41+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr "Això és un punt final de servidor OpenID. Per més informació consulteu"
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr "Identitat:<b>"
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr "Domini:<b>"
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr "Usuari:<b>"
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr "Inici de sessió"
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr "Error:<b>No heu seleccionat cap usuari"
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr "podeu autenticar altres llocs web amb aquesta adreça"
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr "Servidor OpenID autoritzat"
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr "La vostra adreça a Wordpress, Identi.ca &hellip;"
diff --git a/l10n/cs_CZ/admin_dependencies_chk.po b/l10n/cs_CZ/admin_dependencies_chk.po
new file mode 100644
index 00000000000..33a79435b54
--- /dev/null
+++ b/l10n/cs_CZ/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/cs_CZ/admin_migrate.po b/l10n/cs_CZ/admin_migrate.po
new file mode 100644
index 00000000000..c24913e0709
--- /dev/null
+++ b/l10n/cs_CZ/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/cs_CZ/calendar.po b/l10n/cs_CZ/calendar.po
index 4bc27d16c68..0d3b9869286 100644
--- a/l10n/cs_CZ/calendar.po
+++ b/l10n/cs_CZ/calendar.po
@@ -10,21 +10,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Žádné kalendáře nenalezeny."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Žádné události nenalezeny."
 
@@ -32,300 +40,394 @@ msgstr "Žádné události nenalezeny."
 msgid "Wrong calendar"
 msgstr "Nesprávný kalendář"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nová časová zóna:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Časová zóna byla změněna"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Chybný požadavek"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalendář"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM rrrr"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d. MMM[ yyyy]{ '&#8212;' d.[ MMM] yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, rrrr"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Narozeniny"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Obchodní"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Hovor"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klienti"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Doručovatel"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Prázdniny"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Nápady"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Cesta"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Výročí"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Schůzka"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Další"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Osobní"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projekty"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Dotazy"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Pracovní"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "nepojmenováno"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Nový kalendář"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Neopakuje se"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Denně"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Týdně"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Každý všední den"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Jednou za dva týdny"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Měsíčně"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Ročně"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nikdy"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "podle výskytu"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "podle data"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "podle dne v měsíci"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "podle dne v týdnu"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Pondělí"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Úterý"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Středa"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Čtvrtek"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Pátek"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sobota"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Neděle"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "týdenní události v měsíci"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "první"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "druhý"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "třetí"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "čtvrtý"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "pátý"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "poslední"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Leden"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Únor"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Březen"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Duben"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Květen"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Červen"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Červenec"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Srpen"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Září"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Říjen"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Listopad"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Prosinec"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "podle data události"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "po dni (dnech)"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "podle čísel týdnů"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "podle dne a měsíce"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Datum"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Celý den"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Nový kalendář"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Chybějící pole"
@@ -359,40 +461,32 @@ msgstr "Akce končí před zahájením"
 msgid "There was a database fail"
 msgstr "Chyba v databázi"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "týden"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "měsíc"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Seznam"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "dnes"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendáře"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Chyba při převodu souboru"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Vybrat aktivní kalendář"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Vaše kalendáře"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav odkaz"
 
@@ -404,19 +498,19 @@ msgstr "Sdílené kalendáře"
 msgid "No shared calendars"
 msgstr "Žádné sdílené kalendáře"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Sdílet kalendář"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Stáhnout"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Editovat"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Odstranit"
@@ -502,23 +596,23 @@ msgstr "Kategorie oddělené čárkami"
 msgid "Edit categories"
 msgstr "Upravit kategorie"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Celodenní událost"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "od"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "do"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Pokročilé volby"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Umístění"
 
@@ -526,7 +620,7 @@ msgstr "Umístění"
 msgid "Location of the Event"
 msgstr "Místo konání události"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Popis"
 
@@ -534,84 +628,86 @@ msgstr "Popis"
 msgid "Description of the Event"
 msgstr "Popis události"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Opakování"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Vybrat dny v týdnu"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Vybrat dny"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "a denní události v roce"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "a denní události v měsíci"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Vybrat měsíce"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Vybrat týdny"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "a týden s událostmi v roce"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Interval"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Konec"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "výskyty"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "vytvořit nový kalendář"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Importovat soubor kalendáře"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Zvolte prosím kalendář"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "vytvořit nový kalendář"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Název nového kalendáře"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Import"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Kalendář se importuje"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalendář byl úspěšně importován"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Import"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Zavřít dialog"
 
@@ -627,45 +723,73 @@ msgstr "Zobrazit událost"
 msgid "No categories selected"
 msgstr "Žádné kategorie nevybrány"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Vyberte kategorii"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "z"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "v"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Časové pásmo"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Vždy kontrolavat, zda nedošlo ke změně časového pásma"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Formát času"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Týden začína v"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Adresa pro synchronizaci kalendáře pomocí CalDAV:"
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index 2c503b0f71b..04e3220195a 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Chyba při (de)aktivaci adresáře."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id neni nastaveno."
 
@@ -62,7 +62,7 @@ msgstr "Žádné kontakty nenalezeny."
 msgid "There was an error adding the contact."
 msgstr "Během přidávání kontaktu nastala chyba."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "jméno elementu není nastaveno."
 
@@ -86,11 +86,11 @@ msgstr "Pokoušíte se přidat duplicitní atribut: "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Chyba při odstraňování údaje kontaktu."
 
@@ -102,19 +102,19 @@ msgstr "Chybí ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Chyba při parsování VCard pro ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "kontrolní součet není nastaven."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Něco se pokazilo. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Chyba při aktualizaci údaje kontaktu."
 
@@ -163,19 +163,19 @@ msgstr "Chyba při získávání fotky."
 msgid "Error saving contact."
 msgstr "Chyba při ukládání kontaktu."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Chyba při změně velikosti obrázku."
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Chyba při osekávání obrázku."
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Chyba při vytváření dočasného obrázku."
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Chyba při hledání obrázku:"
 
@@ -275,6 +275,10 @@ msgid ""
 "on this server."
 msgstr "Soubor, který se pokoušíte odeslat, přesahuje maximální povolenou velikost."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Vybrat typ"
@@ -533,7 +537,7 @@ msgstr "Upravit podrobnosti jména"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Odstranit"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "Stažení"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Editovat"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nový adresář"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Uložit"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Storno"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
new file mode 100644
index 00000000000..31ccf1b3f90
--- /dev/null
+++ b/l10n/cs_CZ/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
new file mode 100644
index 00000000000..1e85c96d4ad
--- /dev/null
+++ b/l10n/cs_CZ/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
new file mode 100644
index 00000000000..67d9a7179e8
--- /dev/null
+++ b/l10n/cs_CZ/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
new file mode 100644
index 00000000000..15207fae022
--- /dev/null
+++ b/l10n/cs_CZ/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 016e71bd72e..90e81ef9c85 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -74,11 +74,27 @@ msgstr "Česky"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Více"
 
diff --git a/l10n/cs_CZ/tasks.po b/l10n/cs_CZ/tasks.po
new file mode 100644
index 00000000000..1d439040c6b
--- /dev/null
+++ b/l10n/cs_CZ/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
new file mode 100644
index 00000000000..88b8270c806
--- /dev/null
+++ b/l10n/cs_CZ/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/cs_CZ/user_migrate.po b/l10n/cs_CZ/user_migrate.po
new file mode 100644
index 00000000000..f3602dccae2
--- /dev/null
+++ b/l10n/cs_CZ/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/cs_CZ/user_openid.po b/l10n/cs_CZ/user_openid.po
new file mode 100644
index 00000000000..14f4ed1354c
--- /dev/null
+++ b/l10n/cs_CZ/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/da/admin_dependencies_chk.po b/l10n/da/admin_dependencies_chk.po
new file mode 100644
index 00000000000..a0e629c1339
--- /dev/null
+++ b/l10n/da/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/da/admin_migrate.po b/l10n/da/admin_migrate.po
new file mode 100644
index 00000000000..e597d849d4b
--- /dev/null
+++ b/l10n/da/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/da/calendar.po b/l10n/da/calendar.po
index 7207ff883e6..b336da6b45b 100644
--- a/l10n/da/calendar.po
+++ b/l10n/da/calendar.po
@@ -7,25 +7,34 @@
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 # Thomas Tanghus <>, 2012.
+# Thomas Tanghus <thomas@tanghus.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Der blev ikke fundet nogen kalendere."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Der blev ikke fundet nogen begivenheder."
 
@@ -33,300 +42,394 @@ msgstr "Der blev ikke fundet nogen begivenheder."
 msgid "Wrong calendar"
 msgstr "Forkert kalender"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Ny tidszone:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Tidszone ændret"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Ugyldig forespørgsel"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM åååå"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ åååå]{ '&#8212;'[ MMM] d åååå}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, åååå"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Forretning"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Ring"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Kunder"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Leverance"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Helligdage"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideér"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Rejse"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubilæum"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Møde"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Andet"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Privat"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projekter"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Spørgsmål"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Arbejde"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr "af"
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "unavngivet"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Ny Kalender"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Gentages ikke"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Daglig"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Ugentlig"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Alle hverdage"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Hver anden uge"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Månedlig"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Årlig"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "aldrig"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "efter forekomster"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "efter dato"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "efter dag i måneden"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "efter ugedag"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Mandag"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Fredag"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "øndag"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "begivenhedens uge i måneden"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "første"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "anden"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "tredje"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "fjerde"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "femte"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "sidste"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Januar"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februar"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Marts"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "April"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Maj"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Juni"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Juli"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "August"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "September"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Oktober"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "December"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "efter begivenheders dato"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "efter dag(e) i året"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "efter ugenummer/-numre"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "efter dag og måned"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Dato"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "Søn."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "Man."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "Tir."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "Ons."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "Tor."
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "Fre."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "Lør."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "Jan."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "Feb."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "Mar."
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "Apr."
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "Maj"
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "Jun."
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "Jul."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "Aug."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "Sep."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "Okt."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "Nov."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "Dec."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Hele dagen"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Ny Kalender"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Manglende felter"
@@ -360,40 +463,32 @@ msgstr "Begivenheden slutter, inden den begynder"
 msgid "There was a database fail"
 msgstr "Der var en fejl i databasen"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Uge"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Måned"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "I dag"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendere"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Der opstod en fejl under gennemlæsning af filen."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Vælg aktive kalendere"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Dine kalendere"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav-link"
 
@@ -405,19 +500,19 @@ msgstr "Delte kalendere"
 msgid "No shared calendars"
 msgstr "Ingen delte kalendere"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Del kalender"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Hent"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Rediger"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Slet"
@@ -503,23 +598,23 @@ msgstr "Opdel kategorier med kommaer"
 msgid "Edit categories"
 msgstr "Rediger kategorier"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Heldagsarrangement"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Fra"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Til"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Avancerede indstillinger"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Sted"
 
@@ -527,7 +622,7 @@ msgstr "Sted"
 msgid "Location of the Event"
 msgstr "Placering af begivenheden"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -535,84 +630,86 @@ msgstr "Beskrivelse"
 msgid "Description of the Event"
 msgstr "Beskrivelse af begivenheden"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Gentag"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Vælg ugedage"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Vælg dage"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "og begivenhedens dag i året."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "og begivenhedens sag på måneden"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Vælg måneder"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Vælg uger"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "og begivenhedens uge i året."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Interval"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Afslutning"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "forekomster"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "opret en ny kalender"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Importer en kalenderfil"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Vælg venligst kalender"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "opret en ny kalender"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "Vælg en kalender"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Navn på ny kalender"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importer"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importerer kalender"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalender importeret korrekt"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Importer"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Luk dialog"
 
@@ -628,45 +725,73 @@ msgstr "Vis en begivenhed"
 msgid "No categories selected"
 msgstr "Ingen categorier valgt"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Vælg kategori"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "fra"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "kl."
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Tidszone"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Check altid efter ændringer i tidszone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Tidsformat"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24T"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12T"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Ugens første dag"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr "flere oplysninger"
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Synkroniseringsadresse til CalDAV:"
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index cdb9cc135cf..7180b10c289 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Fejl ved (de)aktivering af adressebogen"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "Intet ID medsendt."
 
@@ -64,7 +64,7 @@ msgstr "Der blev ikke fundet nogen kontaktpersoner."
 msgid "There was an error adding the contact."
 msgstr "Der opstod en fejl ved tilføjelse af kontaktpersonen."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "Elementnavnet er ikke medsendt."
 
@@ -88,11 +88,11 @@ msgstr "Kan ikke tilføje overlappende element."
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informationen om vCard er forkert. Genindlæs siden."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Fejl ved sletning af egenskab for kontaktperson."
 
@@ -104,19 +104,19 @@ msgstr "Manglende ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Kunne ikke indlæse VCard med ID'et: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "Checksum er ikke medsendt."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Noget gik grueligt galt. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Fejl ved opdatering af egenskab for kontaktperson."
 
@@ -165,19 +165,19 @@ msgstr "Fejl ved indlæsning af PHOTO feltet."
 msgid "Error saving contact."
 msgstr "Kunne ikke gemme kontaktpersonen."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Kunne ikke ændre billedets størrelse"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Kunne ikke beskære billedet"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Kunne ikke oprette midlertidigt billede"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Kunne ikke finde billedet: "
 
@@ -277,6 +277,10 @@ msgid ""
 "on this server."
 msgstr "Dr."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Vælg type"
@@ -535,7 +539,7 @@ msgstr "Rediger navnedetaljer."
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Slet"
 
@@ -846,30 +850,30 @@ msgstr ""
 msgid "Download"
 msgstr "Download"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Rediger"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Ny adressebog"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Gem"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Fortryd"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
new file mode 100644
index 00000000000..94a4333bd18
--- /dev/null
+++ b/l10n/da/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
new file mode 100644
index 00000000000..d602714dbac
--- /dev/null
+++ b/l10n/da/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
new file mode 100644
index 00000000000..c312be9fba8
--- /dev/null
+++ b/l10n/da/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/da/files_versions.po b/l10n/da/files_versions.po
new file mode 100644
index 00000000000..2aae166d774
--- /dev/null
+++ b/l10n/da/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index fe5deff0c77..f647b2f179e 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Kunne ikke indlæse listen fra App Store"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -45,7 +45,7 @@ msgstr "Ugyldig forespørgsel"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Adgangsfejl"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -53,7 +53,7 @@ msgstr "Sprog ændret"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Fejl"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -73,13 +73,29 @@ msgstr "Dansk"
 
 #: templates/admin.php:14
 msgid "Security Warning"
+msgstr "Sikkerhedsadvarsel"
+
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Mere"
 
@@ -217,7 +233,7 @@ msgstr "Andet"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
-msgstr ""
+msgstr "SubAdmin"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/da/tasks.po b/l10n/da/tasks.po
new file mode 100644
index 00000000000..f2ddaaa160d
--- /dev/null
+++ b/l10n/da/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
new file mode 100644
index 00000000000..186aad26c39
--- /dev/null
+++ b/l10n/da/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/da/user_migrate.po b/l10n/da/user_migrate.po
new file mode 100644
index 00000000000..3c03fa73962
--- /dev/null
+++ b/l10n/da/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/da/user_openid.po b/l10n/da/user_openid.po
new file mode 100644
index 00000000000..a9fdd710c8a
--- /dev/null
+++ b/l10n/da/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/de/admin_dependencies_chk.po b/l10n/de/admin_dependencies_chk.po
new file mode 100644
index 00000000000..cbd173e470f
--- /dev/null
+++ b/l10n/de/admin_dependencies_chk.po
@@ -0,0 +1,76 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Maurice Preuß <>, 2012.
+#   <niko@nik-o-mat.de>, 2012.
+#   <thomas.mueller@tmit.eu>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 20:46+0000\n"
+"Last-Translator: Maurice Preuß <>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr "Das Modul  php-json wird von vielen Anwendungen zur internen Kommunikation benötigt."
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr "Das Modul php-curl wird benötigt, um den Titel der Seite für die Lesezeichen hinzuzufügen."
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr "Das Modul  php-gd wird für die Erzeugung der Vorschaubilder benötigt."
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr "Das Modul  php-ldap wird für die Verbindung mit dem LDAP-Server benötigt."
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr "Das Modul php-zip wird für den gleichzeitigen Download mehrerer Dateien benötigt."
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr "Das Modul  php_mb_multibyte wird benötigt, um das Encoding richtig zu handhaben."
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr "Das Modul php-ctype wird benötigt, um Daten zu prüfen."
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr "Das Modul php-xml wird benötigt, um Dateien über WebDAV zu teilen."
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr "Die Richtlinie allow_url_fopen in Ihrer php.ini sollte auf 1 gesetzt werden, um die Wissensbasis vom OCS-Server abrufen."
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr "Das Modul php-pdo wird benötigt, um Daten in der Datenbank zu speichern."
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr "Status der Abhängigkeiten"
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr "Benutzt von:"
diff --git a/l10n/de/admin_migrate.po b/l10n/de/admin_migrate.po
new file mode 100644
index 00000000000..d4a6b315a18
--- /dev/null
+++ b/l10n/de/admin_migrate.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <niko@nik-o-mat.de>, 2012.
+#   <thomas.mueller@tmit.eu>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:34+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr "Diese ownCloud-Instanz exportieren."
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr "Dies wird eine komprimierte Datei erzeugen, welche die Daten dieser ownCloud-Instanz enthält.\n            Bitte wählen Sie den Exporttyp:"
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr "Exportieren"
diff --git a/l10n/de/calendar.po b/l10n/de/calendar.po
index fb8cc41c667..449a5034197 100644
--- a/l10n/de/calendar.po
+++ b/l10n/de/calendar.po
@@ -4,19 +4,21 @@
 # 
 # Translators:
 #   <admin@s-goecker.de>, 2011, 2012.
+#   <driz@i2pmail.org>, 2012.
 #   <georg.stefan.germany@googlemail.com>, 2011, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
 # Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 #   <niko@nik-o-mat.de>, 2012.
 #   <peddn@web.de>, 2012.
+# Phi Lieb <>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 18:09+0000\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 11:28+0000\n"
 "Last-Translator: JamFX <niko@nik-o-mat.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -77,31 +79,30 @@ msgstr "Fehlerhafte Anfrage"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr "ddd d.M"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr "dddd d.M"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr "dddd, d. MMM yyyy"
 
@@ -226,7 +227,7 @@ msgstr "an einem Monatstag"
 msgid "by weekday"
 msgstr "an einem Wochentag"
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Montag"
 
@@ -250,7 +251,7 @@ msgstr "Freitag"
 msgid "Saturday"
 msgstr "Samstag"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -467,33 +468,25 @@ msgstr "Der Termin hört auf, bevor er angefangen hat."
 msgid "There was a database fail"
 msgstr "Datenbankfehler"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Woche"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Monat"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Heute"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Kalender"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Fehler beim Einlesen der Datei."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Aktive Kalender wählen"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr "Einstellungen"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -745,55 +738,63 @@ msgstr "von"
 msgid "at"
 msgstr "um"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr "Allgemein"
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "immer die Zeitzone überprüfen"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr "Zeitzone automatisch aktualisieren"
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr "Zeitformat"
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "erster Wochentag"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr "Erster Wochentag"
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr "Zwischenspeicher"
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
-msgstr "Lösche den Zwischenspeicher für wiederholende Veranstaltungen."
+msgstr "Lösche den Zwischenspeicher für wiederholende Veranstaltungen"
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr "URLs"
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
-msgstr "CalDAV-Kalender gleicht Adressen ab."
+msgstr "CalDAV-Kalender gleicht Adressen ab"
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr "weitere Informationen"
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr "Primäre Adresse (Kontakt u.a.)"
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr "Nur lesende(r) iCalender-Link(s)"
 
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index 05b7ba69ed5..2550ffd9033 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 #   <admin@s-goecker.de>, 2012.
+#   <driz@i2pmail.org>, 2012.
 #   <fh@cbix.de>, 2012.
 #   <florian.ruechel+owncloud@gmail.com>, 2012.
 #   <georg.stefan.germany@googlemail.com>, 2011.
@@ -15,6 +16,7 @@
 #   <mi.sc@gmx.net>, 2012.
 #   <nelsonfritsch@gmail.com>, 2012.
 #   <niko@nik-o-mat.de>, 2012.
+# Phi Lieb <>, 2012.
 # Susi  <>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
 # Thomas Müller <>, 2012.
@@ -22,9 +24,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-07 02:04+0200\n"
-"PO-Revision-Date: 2012-08-06 16:13+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 20:22+0000\n"
+"Last-Translator: driz <driz@i2pmail.org>\n"
 "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"
@@ -37,8 +39,8 @@ msgid "Error (de)activating addressbook."
 msgstr "(De-)Aktivierung des Adressbuches fehlgeschlagen"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID ist nicht angegeben."
 
@@ -48,7 +50,7 @@ msgstr "Adressbuch kann nicht mir leeren Namen aktualisiert werden."
 
 #: ajax/addressbook/update.php:28
 msgid "Error updating addressbook."
-msgstr "Adressbuch aktualisieren fehlgeschlagen"
+msgstr "Adressbuch aktualisieren fehlgeschlagen."
 
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
@@ -72,9 +74,9 @@ msgstr "Keine Kontakte gefunden."
 
 #: ajax/contact/add.php:47
 msgid "There was an error adding the contact."
-msgstr "Erstellen des Kontakts fehlgeschlagen"
+msgstr "Erstellen des Kontakts fehlgeschlagen."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "Kein Name für das Element angegeben."
 
@@ -98,13 +100,13 @@ msgstr "Versuche, doppelte Eigenschaft hinzuzufügen: "
 msgid "Error adding contact property: "
 msgstr "Fehler beim Hinzufügen der Kontakteigenschaft:"
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Die Information der vCard ist fehlerhaft. Bitte aktualisiere die Seite."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
-msgstr "Kontakteigenschaft löschen fehlgeschlagen"
+msgstr "Kontakteigenschaft löschen fehlgeschlagen."
 
 #: ajax/contact/details.php:31
 msgid "Missing ID"
@@ -114,19 +116,19 @@ msgstr "Fehlende ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Fehler beim Einlesen der VCard für die ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "Keine Prüfsumme angegeben."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Irgendwas ist hier so richtig schief gelaufen. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Kontakteigenschaft aktualisieren fehlgeschlagen"
 
@@ -173,21 +175,21 @@ msgstr "Fehler beim Abrufen der PHOTO Eigenschaft."
 
 #: ajax/savecrop.php:98
 msgid "Error saving contact."
-msgstr "Fehler beim Speichern des Kontaktes"
+msgstr "Fehler beim Speichern des Kontaktes."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Fehler bei der Größenänderung des Bildes"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Fehler beim Zuschneiden des Bildes"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Fehler beim erstellen des temporären Bildes"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Fehler beim Suchen des Bildes: "
 
@@ -201,13 +203,13 @@ msgstr "Alles bestens, Datei erfolgreich übertragen."
 
 #: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr "Datei größer als durch die upload_max_filesize Direktive in php.ini erlaubt"
+msgstr "Datei größer, als durch die upload_max_filesize Direktive in php.ini erlaubt"
 
 #: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Datei größer als die MAX_FILE_SIZE Direktive erlaubt, die im HTML Formular spezifiziert ist"
+msgstr "Datei größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML Formular spezifiziert ist"
 
 #: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
@@ -243,7 +245,7 @@ msgstr "Diese Funktion steht leider noch nicht zur Verfügung"
 
 #: js/contacts.js:71
 msgid "Not implemented"
-msgstr "Nicht Verfügbar"
+msgstr "Nicht verfügbar"
 
 #: js/contacts.js:76
 msgid "Couldn't get a valid address."
@@ -261,7 +263,7 @@ msgstr "Fehler"
 
 #: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr "Dieses Feld darf nicht Leer sein."
+msgstr "Dieses Feld darf nicht leer sein."
 
 #: js/contacts.js:741
 msgid "Couldn't serialize elements."
@@ -271,7 +273,7 @@ msgstr "Konnte Elemente nicht serialisieren"
 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"
+msgstr "'deleteProperty' wurde ohne Argumente aufgerufen, bitte melde dies auf bugs.owncloud.org"
 
 #: js/contacts.js:884
 msgid "Edit name"
@@ -285,7 +287,11 @@ msgstr "Keine Datei(en) zum Hochladen ausgewählt"
 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."
+msgstr "Die Datei, die du hochladen willst, überschreitet die maximale Größe für Datei-Uploads auf diesem Server."
+
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr "Fehler beim Laden des Profilbildes."
 
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
@@ -295,7 +301,7 @@ msgstr "Wähle Typ"
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
-msgstr "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten ..."
+msgstr "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten."
 
 #: js/loader.js:49
 msgid "Result: "
@@ -533,7 +539,7 @@ msgstr "Neues Foto hochladen"
 
 #: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
-msgstr "Foto aus ownCloud auswählen"
+msgstr "Foto aus der ownCloud auswählen"
 
 #: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
@@ -595,7 +601,7 @@ msgstr "Bitte eine gültige E-Mail-Adresse angeben."
 
 #: templates/part.contact.php:64
 msgid "Enter email address"
-msgstr "E-Mail-Adresse angeben."
+msgstr "E-Mail-Adresse angeben"
 
 #: templates/part.contact.php:68
 msgid "Mail to address"
@@ -820,11 +826,11 @@ msgstr "Adressbücher konfigurieren"
 msgid "Select Address Books"
 msgstr "Wähle Adressbuch"
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr "Name eingeben"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr "Beschreibung eingeben"
 
@@ -838,7 +844,7 @@ msgstr "mehr Info"
 
 #: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
-msgstr "primäre Adresse (für Kontact o.ä. Programme)"
+msgstr "primäre Adresse (für Kontakt o.ä. Programme)"
 
 #: templates/settings.php:7
 msgid "iOS/OS X"
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
new file mode 100644
index 00000000000..38b9a4bc055
--- /dev/null
+++ b/l10n/de/files_encryption.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <driz@i2pmail.org>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 20:21+0000\n"
+"Last-Translator: driz <driz@i2pmail.org>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr "Verschlüsselung"
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr "Die folgenden Dateitypen von der Verschlüsselung ausnehmen"
+
+#: templates/settings.php:5
+msgid "None"
+msgstr "Keine"
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr "Verschlüsselung aktivieren"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
new file mode 100644
index 00000000000..84c825dfd96
--- /dev/null
+++ b/l10n/de/files_external.po
@@ -0,0 +1,83 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <thomas.mueller@tmit.eu>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 08:18+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr "Externer Speicher"
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr "Mount-Point"
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr "Backend"
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr "Optionen"
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr "Zutreffend"
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr "Mount-Point hinzufügen"
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr "Nicht definiert"
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr "Alle Benutzer"
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr "Gruppen"
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr "Benutzer"
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr "Löschen"
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr "SSL-Root-Zertifikate"
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr "Root-Zertifikate importieren"
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr "Externer Speicher für Benutzer aktivieren"
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr "Erlaubt Benutzern Ihre eigenen externen Speicher einzubinden"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
new file mode 100644
index 00000000000..85e27c2e094
--- /dev/null
+++ b/l10n/de/files_sharing.po
@@ -0,0 +1,56 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <niko@nik-o-mat.de>, 2012.
+#   <thomas.mueller@tmit.eu>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:38+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr "Ihre geteilten Dateien"
+
+#: templates/list.php:6
+msgid "Item"
+msgstr "Objekt"
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr "Teilen mit"
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr "Berechtigungen"
+
+#: templates/list.php:16
+msgid "Read"
+msgstr "Lesen"
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Löschen"
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr "Austausch ermöglichen"
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr "Benutzer dürfen Dateien nochmals teilen, auch wenn sie nicht der Besitzer dieser Dateien sind."
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
new file mode 100644
index 00000000000..789af981fbf
--- /dev/null
+++ b/l10n/de/files_versions.po
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <thomas.mueller@tmit.eu>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 08:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr "Alle Versionen löschen"
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr "Datei-Versionierung aktivieren"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 30f4a024dde..96f616570a4 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-07 02:05+0200\n"
-"PO-Revision-Date: 2012-08-06 19:52+0000\n"
-"Last-Translator: designpoint <info@designpoint.ch>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 11:29+0000\n"
+"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -77,11 +77,27 @@ msgstr "Deutsch"
 msgid "Security Warning"
 msgstr "Sicherheitshinweis"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr "Cron"
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr "Führe eine Aufgabe pro geladener Seite aus."
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr "cron.php ist beim Webcron-Service registriert"
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr "Nutze System-Cron-Service"
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Mehr"
 
@@ -175,11 +191,11 @@ msgstr "E-Mail"
 
 #: templates/personal.php:31
 msgid "Your email address"
-msgstr "Ihre E-Mail Adresse"
+msgstr "Ihre E-Mail-Adresse"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr "Trage eine E-Mail Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
+msgstr "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
@@ -187,7 +203,7 @@ msgstr "Sprache"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr "Hilf bei der Übersetzung!"
+msgstr "Hilf bei der Übersetzung"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
diff --git a/l10n/de/tasks.po b/l10n/de/tasks.po
new file mode 100644
index 00000000000..ad1bfcf952b
--- /dev/null
+++ b/l10n/de/tasks.po
@@ -0,0 +1,108 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <niko@nik-o-mat.de>, 2012.
+#   <thomas.mueller@tmit.eu>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:49+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr "Datum/Uhrzeit ungültig"
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr "Aufgaben"
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr "Keine Kategorie"
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr "Nicht angegeben"
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr "1=am höchsten"
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr "5=Durchschnitt"
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr "9=am niedrigsten"
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr "Leere Zusammenfassung"
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr "Ungültige Prozent abgeschlossen"
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr "Falsche Priorität"
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr "Aufgabe hinzufügen"
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr "Nach Fälligkeit sortieren"
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr "Nach Kategorie sortieren "
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr "Nach Fertigstellung sortieren"
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr "Nach Ort sortieren"
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr "Nach Priorität sortieren"
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr "Nach Label sortieren"
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr "Lade Aufgaben..."
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr "Wichtig"
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr "Mehr"
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr "Weniger"
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr "Löschen"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
new file mode 100644
index 00000000000..f84a3add4d0
--- /dev/null
+++ b/l10n/de/user_ldap.po
@@ -0,0 +1,165 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Maurice Preuß <>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 20:45+0000\n"
+"Last-Translator: Maurice Preuß <>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr "Host"
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr "Passwort"
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr "Benutzer Login Filter"
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch."
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr "Benutzer Filter Liste"
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr "Gruppen Filter"
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr "Port"
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr "Verwenden Sie es nicht für SSL-Verbindungen, wird es scheitern."
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr "Schalte die SSL Zertifikatsprüfung aus."
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr "in bytes"
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr "in Sekunden. Eine Änderung leert den Cache."
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr "Hilfe"
diff --git a/l10n/de/user_migrate.po b/l10n/de/user_migrate.po
new file mode 100644
index 00000000000..4423a018e2b
--- /dev/null
+++ b/l10n/de/user_migrate.po
@@ -0,0 +1,53 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <niko@nik-o-mat.de>, 2012.
+#   <thomas.mueller@tmit.eu>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:51+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr "Export"
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr "Beim Export der Datei ist etwas schief gegangen."
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr "Es ist ein Fehler aufgetreten."
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr "Ihr Konto exportieren"
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr "Eine komprimierte Datei wird erzeugen, die Ihr ownCloud-Konto enthält."
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr "Konto importieren"
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr "Zip-Archiv mit Benutzerdaten"
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr "Importieren"
diff --git a/l10n/de/user_openid.po b/l10n/de/user_openid.po
new file mode 100644
index 00000000000..57865585448
--- /dev/null
+++ b/l10n/de/user_openid.po
@@ -0,0 +1,56 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <niko@nik-o-mat.de>, 2012.
+#   <thomas.mueller@tmit.eu>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:54+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr "Dies ist ein OpenID-Server-Endpunkt. Für weitere Informationen schauen Sie sich folgendes an:"
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr "Identität: <b>"
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr "Bereich: <b>"
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr "Benutzer: <b>"
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr "Anmelden"
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr "Fehler: <b> Kein Benutzer gewählt"
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr "Sie können sich auf anderen Seiten mit dieser Adresse authentifizieren."
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr "Authorisierter OpenID-Anbieter"
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr "Ihre Adresse bei Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/el/admin_dependencies_chk.po b/l10n/el/admin_dependencies_chk.po
new file mode 100644
index 00000000000..d1a97dc8f22
--- /dev/null
+++ b/l10n/el/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/el/admin_migrate.po b/l10n/el/admin_migrate.po
new file mode 100644
index 00000000000..9c9cb6234ee
--- /dev/null
+++ b/l10n/el/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/el/calendar.po b/l10n/el/calendar.po
index 4f8562971b6..b8bca272398 100644
--- a/l10n/el/calendar.po
+++ b/l10n/el/calendar.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:03+0200\n"
-"PO-Revision-Date: 2012-07-28 11:39+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "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"
@@ -74,31 +74,30 @@ msgstr "Μη έγκυρο αίτημα"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Ημερολόγιο"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr "dddd, MMM d, yyyy"
 
@@ -223,7 +222,7 @@ msgstr "κατά ημέρα"
 msgid "by weekday"
 msgstr "κατά εβδομάδα"
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Δευτέρα"
 
@@ -247,7 +246,7 @@ msgstr "Παρασκευή"
 msgid "Saturday"
 msgstr "Σάββατο"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Κυριακή"
 
@@ -464,33 +463,25 @@ msgstr "Το συμβάν ολοκληρώνεται πριν από την έν
 msgid "There was a database fail"
 msgstr "Υπήρξε σφάλμα στη βάση δεδομένων"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Εβδομάδα"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Μήνας"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Λίστα"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Σήμερα"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Ημερολόγια"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Υπήρξε μια αποτυχία, κατά την σάρωση του αρχείου."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Επιλέξτε τα ενεργά ημερολόγια"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -742,55 +733,63 @@ msgstr "του"
 msgid "at"
 msgstr "στο"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Ζώνη ώρας"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Έλεγχος πάντα για τις αλλαγές της ζώνης ώρας"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Μορφή ώρας"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24ω"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12ω"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Πρώτη μέρα της εβδομάδας"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr "Cache"
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr "Εκκαθάριση λανθάνουσας μνήμης για επανάληψη γεγονότων"
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr "Διευθύνσεις συγχρονισμού ημερολογίου CalDAV"
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr "περισσότερες πλροφορίες"
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr "Κύρια Διεύθυνση(Επαφή και άλλα)"
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr " iCalendar link(s) μόνο για ανάγνωση"
 
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index 5ed7fe9c391..548db19793d 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -28,8 +28,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Σφάλμα (απ)ενεργοποίησης βιβλίου διευθύνσεων"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "δεν ορίστηκε id"
 
@@ -65,7 +65,7 @@ msgstr "Δεν βρέθηκαν επαφές"
 msgid "There was an error adding the contact."
 msgstr "Σφάλμα κατά την προσθήκη επαφής."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "δεν ορίστηκε όνομα στοιχείου"
 
@@ -89,11 +89,11 @@ msgstr "Προσπάθεια προσθήκης διπλότυπης ιδιότ�
 msgid "Error adding contact property: "
 msgstr "Σφάλμα στη προσθήκη ιδιότητας επαφής"
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Οι πληροφορίες σχετικά με vCard είναι εσφαλμένες. Παρακαλώ επαναφορτώστε τη σελίδα."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Σφάλμα διαγραφής ιδιότητας επαφής."
 
@@ -105,19 +105,19 @@ msgstr "Λείπει ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Σφάλμα κατά την ανάγνωση του VCard για το ID:\""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "δε ορίστηκε checksum "
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Οι πληροφορίες για τη vCard είναι λανθασμένες.Παρακαλώ ξαναφορτώστε τη σελίδα: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Κάτι χάθηκε στο άγνωστο. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Σφάλμα ενημέρωσης ιδιότητας επαφής."
 
@@ -166,19 +166,19 @@ msgstr "Σφάλμα κατά τη λήψη ιδιοτήτων ΦΩΤΟΓΡΑΦ�
 msgid "Error saving contact."
 msgstr "Σφάλμα κατά την αποθήκευση επαφής."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Σφάλμα κατά την αλλαγή μεγέθους εικόνας"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Σφάλμα κατά την περικοπή εικόνας"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Σφάλμα κατά την δημιουργία προσωρινής εικόνας"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Σφάλμα κατά την εύρεση της εικόνας: "
 
@@ -278,6 +278,10 @@ msgid ""
 "on this server."
 msgstr "Το αρχείο που προσπαθείτε να ανεβάσετε υπερβαίνει το μέγιστο μέγεθος για τις προσθήκες αρχείων σε αυτόν τον server."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Επιλογή τύπου"
@@ -536,7 +540,7 @@ msgstr "Αλλάξτε τις λεπτομέρειες ονόματος"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -847,30 +851,30 @@ msgstr ""
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Επεξεργασία"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Νέο βιβλίο διευθύνσεων"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr "Όνομα"
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr "Περισσότερα..."
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
new file mode 100644
index 00000000000..18179301de3
--- /dev/null
+++ b/l10n/el/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
new file mode 100644
index 00000000000..aec86d2f48b
--- /dev/null
+++ b/l10n/el/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
new file mode 100644
index 00000000000..ffff3a6e150
--- /dev/null
+++ b/l10n/el/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/el/files_versions.po b/l10n/el/files_versions.po
new file mode 100644
index 00000000000..0c3ae5537c3
--- /dev/null
+++ b/l10n/el/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index f0ece524c30..60e4a324fd3 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -75,11 +75,27 @@ msgstr "__όνομα_γλώσσας__"
 msgid "Security Warning"
 msgstr "Προειδοποίηση Ασφαλείας"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Αρχείο καταγραφής"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Περισσότερο"
 
diff --git a/l10n/el/tasks.po b/l10n/el/tasks.po
new file mode 100644
index 00000000000..67d03159fdb
--- /dev/null
+++ b/l10n/el/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
new file mode 100644
index 00000000000..d41d5a4ced2
--- /dev/null
+++ b/l10n/el/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/el/user_migrate.po b/l10n/el/user_migrate.po
new file mode 100644
index 00000000000..81504510c58
--- /dev/null
+++ b/l10n/el/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/el/user_openid.po b/l10n/el/user_openid.po
new file mode 100644
index 00000000000..5ea17f45a3b
--- /dev/null
+++ b/l10n/el/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/eo/admin_dependencies_chk.po b/l10n/eo/admin_dependencies_chk.po
new file mode 100644
index 00000000000..be22a0e5e85
--- /dev/null
+++ b/l10n/eo/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/eo/admin_migrate.po b/l10n/eo/admin_migrate.po
new file mode 100644
index 00000000000..ca3e132bd3b
--- /dev/null
+++ b/l10n/eo/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/eo/calendar.po b/l10n/eo/calendar.po
index d01d9bb11ba..b0799bee788 100644
--- a/l10n/eo/calendar.po
+++ b/l10n/eo/calendar.po
@@ -3,26 +3,35 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano  <mstreet@kde.org.ar>, 2012.
 #   <mstreet@kde.org.ar>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr "Ne ĉiuj kalendaroj estas tute kaŝmemorigitaj"
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr "Ĉio ŝajnas tute kaŝmemorigita"
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Neniu kalendaro troviĝis."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Neniu okazaĵo troviĝis."
 
@@ -30,300 +39,394 @@ msgstr "Neniu okazaĵo troviĝis."
 msgid "Wrong calendar"
 msgstr "Malĝusta kalendaro"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr "Aŭ la dosiero enhavas neniun okazaĵon aŭ ĉiuj okazaĵoj jam estas konservitaj en via kalendaro."
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr "okazaĵoj estas konservitaj en la nova kalendaro"
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "Enporto malsukcesis"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "okazaĵoj estas konservitaj en via kalendaro"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nova horzono:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "La horozono estas ŝanĝita"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Nevalida peto"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalendaro"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd d/M"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd d/M"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d MMM[ yyyy]{ '&#8212;'d[ MMM] yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, d-a de MMM yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Naskiĝotago"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Negoco"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Voko"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klientoj"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Livero"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Ferioj"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideoj"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Vojaĝo"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubileo"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Rendevuo"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Alia"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Persona"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projektoj"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Demandoj"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Laboro"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr "de"
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "nenomita"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Nova kalendaro"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Ĉi tio ne ripetiĝas"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Tage"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Semajne"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Labortage"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Semajnduope"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Monate"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Jare"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "neniam"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "laŭ aperoj"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "laŭ dato"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "laŭ monattago"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "laŭ semajntago"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "lundo"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "mardo"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "merkredo"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "ĵaŭdo"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "vendredo"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "sabato"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "dimanĉo"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "la monatsemajno de la okazaĵo"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "unua"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "dua"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "tria"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "kvara"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "kvina"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "lasta"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Januaro"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februaro"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Marto"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Aprilo"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Majo"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Junio"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Julio"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Aŭgusto"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Septembro"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Oktobro"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Novembro"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Decembro"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "laŭ okazaĵdato"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "laŭ jartago(j)"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "laŭ semajnnumero(j)"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "laŭ tago kaj monato"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Dato"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "dim."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "lun."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "mar."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "mer."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "ĵaŭ."
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "ven."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "sab."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "Jan."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "Feb."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "Mar."
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "Apr."
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "Maj."
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "Jun."
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "Jul."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "Aŭg."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "Sep."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "Okt."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "Nov."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "Dec."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "La tuta tago"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Nova kalendaro"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Mankas iuj kampoj"
@@ -357,40 +460,32 @@ msgstr "La okazaĵo finas antaŭ komenci"
 msgid "There was a database fail"
 msgstr "Datumbaza malsukceso okazis"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Semajno"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Monato"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Listo"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Hodiaŭ"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendaroj"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Malsukceso okazis dum analizo de la dosiero."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Elektu aktivajn kalendarojn"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Viaj kalendaroj"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav-a ligilo"
 
@@ -402,19 +497,19 @@ msgstr "Kunhavigitaj kalendaroj"
 msgid "No shared calendars"
 msgstr "Neniu kunhavigita kalendaro"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Kunhavigi kalendaron"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Redakti"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Forigi"
@@ -500,23 +595,23 @@ msgstr "Disigi kategoriojn per komoj"
 msgid "Edit categories"
 msgstr "Redakti kategoriojn"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "La tuta tago"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Ekde"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Ĝis"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Altnivela agordo"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Loko"
 
@@ -524,7 +619,7 @@ msgstr "Loko"
 msgid "Location of the Event"
 msgstr "Loko de okazaĵo"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Priskribo"
 
@@ -532,84 +627,86 @@ msgstr "Priskribo"
 msgid "Description of the Event"
 msgstr "Okazaĵopriskribo"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Ripeti"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Altnivelo"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Elekti semajntagojn"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Elekti tagojn"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "kaj la jartago de la okazaĵo."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "kaj la monattago de la okazaĵo."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Elekti monatojn"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Elekti semajnojn"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "kaj la jarsemajno de la okazaĵo."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervalo"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Fino"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "aperoj"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "Krei novan kalendaron"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Enporti kalendarodosieron"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
 msgstr "Bonvolu elekti kalendaron"
 
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "Krei novan kalendaron"
-
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Nomo de la nova kalendaro"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Enporti"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr "Prenu haveblan nomon!"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Kalendaro estas enportata"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr "Kalendaro kun ĉi tiu nomo jam ekzastas. Se vi malgraŭe daŭros, ĉi tiuj kalendaroj kunfandiĝos."
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "La kalendaro enportiĝis sukcese"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Enporti"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Fermi la dialogon"
 
@@ -625,45 +722,73 @@ msgstr "Vidi okazaĵon"
 msgid "No categories selected"
 msgstr "Neniu kategorio elektita"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Elekti kategorion"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "de"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "ĉe"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Horozono"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Ĉiam kontroli ĉu la horzono ŝanĝiĝis"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Tempoformo"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Unua tago de la semajno"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr "Kaŝmemoro"
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr "Forviŝi kaŝmemoron por ripeto de okazaĵoj"
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr "sinkronigaj adresoj por CalDAV-kalendaroj"
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr "pli da informo"
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr "Ĉefa adreso (Kontact kaj aliaj)"
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Adreso de kalendarosinkronigo per CalDAV:"
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr "Nurlegebla(j) iCalendar-ligilo(j)"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index 94fd3651af4..7a635c7d611 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Eraro dum (mal)aktivigo de adresaro."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "identigilo ne agordiĝis."
 
@@ -61,7 +61,7 @@ msgstr "Neniu kontakto troviĝis."
 msgid "There was an error adding the contact."
 msgstr "Eraro okazis dum aldono de kontakto."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "eronomo ne agordiĝis."
 
@@ -85,11 +85,11 @@ msgstr "Provante aldoni duobligitan propraĵon:"
 msgid "Error adding contact property: "
 msgstr "Eraro aldonante kontakta propraĵo:"
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informo pri vCard estas malĝusta. Bonvolu reŝargi la paĝon."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Eraro dum forigo de kontaktopropraĵo."
 
@@ -101,19 +101,19 @@ msgstr "Mankas identigilo"
 msgid "Error parsing VCard for ID: \""
 msgstr "Eraro dum analizo de VCard por identigilo:"
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "kontrolsumo ne agordiĝis."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Io FUBAR-is."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Eraro dum ĝisdatigo de kontaktopropraĵo."
 
@@ -162,19 +162,19 @@ msgstr "Eraro dum ekhaviĝis la propraĵon PHOTO."
 msgid "Error saving contact."
 msgstr "Eraro dum konserviĝis kontakto."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Eraro dum aligrandiĝis bildo"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Eraro dum stuciĝis bildo."
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Eraro dum kreiĝis provizora bildo."
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Eraro dum serĉo de bildo: "
 
@@ -188,13 +188,13 @@ msgstr "Ne estas eraro, la dosiero alŝutiĝis sukcese."
 
 #: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "La alŝutita dosiero transpasas la preskribon upload_max_filesize en php.ini"
 
 #: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "La alŝutita dosiero transpasas la preskribon MAX_FILE_SIZE kiu specifiĝis en la HTML-formularo"
 
 #: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
 msgid "The uploaded file was only partially uploaded"
@@ -272,6 +272,10 @@ msgstr "Neniu dosiero elektita por alŝuto."
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
+msgstr "La dosiero, kiun vi provas alŝuti, transpasas la maksimuman grandon por dosieraj alŝutoj en ĉi tiu servilo."
+
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
 msgstr ""
 
 #: js/contacts.js:1337 js/contacts.js:1371
@@ -380,7 +384,7 @@ msgstr "Negoco"
 
 #: lib/app.php:185
 msgid "Call"
-msgstr ""
+msgstr "Voko"
 
 #: lib/app.php:186
 msgid "Clients"
@@ -392,7 +396,7 @@ msgstr ""
 
 #: lib/app.php:188
 msgid "Holidays"
-msgstr ""
+msgstr "Ferioj"
 
 #: lib/app.php:189
 msgid "Ideas"
@@ -476,11 +480,11 @@ msgstr ""
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Sekva adresaro"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Malsekva adresaro"
 
 #: templates/index.php:54
 msgid "Actions"
@@ -488,7 +492,7 @@ msgstr "Agoj"
 
 #: templates/index.php:57
 msgid "Refresh contacts list"
-msgstr ""
+msgstr "Refreŝigi la kontaktoliston"
 
 #: templates/index.php:59
 msgid "Add new contact"
@@ -532,7 +536,7 @@ msgstr "Redakti detalojn de nomo"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Forigi"
 
@@ -843,30 +847,30 @@ msgstr "Montri nur legeblan VCF-ligilon"
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Redakti"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nova adresaro"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr "Nomo"
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr "Priskribo"
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Konservi"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Nuligi"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr "Pli..."
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
new file mode 100644
index 00000000000..3e173e196c2
--- /dev/null
+++ b/l10n/eo/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
new file mode 100644
index 00000000000..089953a7283
--- /dev/null
+++ b/l10n/eo/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
new file mode 100644
index 00000000000..ba8f508b669
--- /dev/null
+++ b/l10n/eo/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po
new file mode 100644
index 00000000000..0d6b7356f99
--- /dev/null
+++ b/l10n/eo/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 19ee661a935..44965561de5 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Ne eblis ŝargi liston el aplikaĵovendejo"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -49,7 +49,7 @@ msgstr "La lingvo estas ŝanĝita"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Eraro"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -71,11 +71,27 @@ msgstr "Esperanto"
 msgid "Security Warning"
 msgstr "Sekureca averto"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Pli"
 
diff --git a/l10n/eo/tasks.po b/l10n/eo/tasks.po
new file mode 100644
index 00000000000..a829a6ae23a
--- /dev/null
+++ b/l10n/eo/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
new file mode 100644
index 00000000000..0a6274edd44
--- /dev/null
+++ b/l10n/eo/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/eo/user_migrate.po b/l10n/eo/user_migrate.po
new file mode 100644
index 00000000000..079fff49c79
--- /dev/null
+++ b/l10n/eo/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/eo/user_openid.po b/l10n/eo/user_openid.po
new file mode 100644
index 00000000000..b982103d358
--- /dev/null
+++ b/l10n/eo/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/es/admin_dependencies_chk.po b/l10n/es/admin_dependencies_chk.po
new file mode 100644
index 00000000000..4f43ec3c307
--- /dev/null
+++ b/l10n/es/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/es/admin_migrate.po b/l10n/es/admin_migrate.po
new file mode 100644
index 00000000000..fd2230f4c7d
--- /dev/null
+++ b/l10n/es/admin_migrate.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <juanma@kde.org.ar>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 04:59+0000\n"
+"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr "Exportar esta instancia de ownCloud"
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr "Se creará un archivo comprimido que contendrá los datos de esta instancia de owncloud.\n            Por favor elegir el tipo de exportación:"
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr "Exportar"
diff --git a/l10n/es/calendar.po b/l10n/es/calendar.po
index 4306d405f6d..06a6465879a 100644
--- a/l10n/es/calendar.po
+++ b/l10n/es/calendar.po
@@ -3,29 +3,39 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <davidlopez.david@gmail.com>, 2012.
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2011, 2012.
 # oSiNaReF  <>, 2012.
+#   <rafabayona@gmail.com>, 2012.
 #   <sergioballesterossolanas@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr "Aún no se han guardado en caché todos los calendarios"
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr "Parece que se ha guardado todo en caché"
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "No se encontraron calendarios."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "No se encontraron eventos."
 
@@ -33,300 +43,394 @@ msgstr "No se encontraron eventos."
 msgid "Wrong calendar"
 msgstr "Calendario incorrecto"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr "El archivo no contiene eventos o ya existen en tu calendario."
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr "Los eventos han sido guardados en el nuevo calendario"
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "Fallo en la importación"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "eventos se han guardado en tu calendario"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nueva zona horaria:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Zona horaria cambiada"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Petición no válida"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Calendario"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Cumpleaños"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Negocios"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Llamada"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Clientes"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Entrega"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Festivos"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideas"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Viaje"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Aniversario"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Reunión"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Otro"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Personal"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Proyectos"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Preguntas"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Trabajo"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr "por"
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "Sin nombre"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Nuevo calendario"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "No se repite"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Diariamente"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Días de semana laboral"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Cada 2 semanas"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Mensualmente"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Anualmente"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nunca"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "por ocurrencias"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "por fecha"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "por día del mes"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "por día de la semana"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Lunes"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Martes"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Jueves"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Viernes"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sábado"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Domingo"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "eventos de la semana del mes"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "primer"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "segundo"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "tercer"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "cuarto"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "quinto"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "último"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Enero"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Febrero"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Marzo"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Abril"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mayo"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Junio"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Julio"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Agosto"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Septiembre"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Octubre"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Noviembre"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Diciembre"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "por fecha de los eventos"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "por día(s) del año"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "por número(s) de semana"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "por día y mes"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Fecha"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Cal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "Dom."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "Lun."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "Mar."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "Mier."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "Jue."
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "Vie."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "Sab."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "Ene."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "Feb."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "Mar."
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "Abr."
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "May."
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "Jun."
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "Jul."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "Ago."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "Sep."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "Oct."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "Nov."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "Dic."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Todo el día"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Nuevo calendario"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Los campos que faltan"
@@ -360,40 +464,32 @@ msgstr "El evento termina antes de que comience"
 msgid "There was a database fail"
 msgstr "Se ha producido un error en la base de datos"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Semana"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mes"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Hoy"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Calendarios"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Se ha producido un fallo al analizar el archivo."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Elige los calendarios activos"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Tus calendarios"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Enlace a CalDav"
 
@@ -405,19 +501,19 @@ msgstr "Calendarios compartidos"
 msgid "No shared calendars"
 msgstr "Calendarios no compartidos"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Compartir calendario"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Eliminar"
@@ -503,23 +599,23 @@ msgstr "Separar categorías con comas"
 msgid "Edit categories"
 msgstr "Editar categorías"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Todo el día"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Desde"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Hasta"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Opciones avanzadas"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Lugar"
 
@@ -527,7 +623,7 @@ msgstr "Lugar"
 msgid "Location of the Event"
 msgstr "Lugar del evento"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Descripción"
 
@@ -535,84 +631,86 @@ msgstr "Descripción"
 msgid "Description of the Event"
 msgstr "Descripción del evento"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Repetir"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Seleccionar días de la semana"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Seleccionar días"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "y el día del año de los eventos."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "y el día del mes de los eventos."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Seleccionar meses"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Seleccionar semanas"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "y la semana del año de los eventos."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervalo"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Fin"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "ocurrencias"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "Crear un nuevo calendario"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Importar un archivo de calendario"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Por favor elige el calendario"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "Crear un nuevo calendario"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "Por favor, escoge un calendario"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Nombre del nuevo calendario"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importar"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr "¡Elige un nombre disponible!"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importando calendario"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr "Ya existe un calendario con este nombre. Si continúas, se combinarán los calendarios."
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Calendario importado exitosamente"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Importar"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Cerrar diálogo"
 
@@ -628,45 +726,73 @@ msgstr "Ver un evento"
 msgid "No categories selected"
 msgstr "Ninguna categoría seleccionada"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Seleccionar categoría"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "de"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "a las"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Zona horaria"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Comprobar siempre por cambios en la zona horaria"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Formato de hora"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Primer día de la semana"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr "Caché"
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr "Limpiar caché de eventos recurrentes"
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr "Direcciones de sincronización de calendario CalDAV:"
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr "Más información"
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr "Dirección principal (Kontact y otros)"
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Dirección de sincronización de calendario CalDAV:"
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr "Enlace(s) iCalendar de sólo lectura"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index 7ea5f0efd0a..d3ffeee5d35 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <davidlopez.david@gmail.com>, 2012.
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2011, 2012.
 # oSiNaReF  <>, 2012.
@@ -12,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -27,8 +28,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Error al (des)activar libreta de direcciones."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "no se ha puesto ninguna ID."
 
@@ -64,7 +65,7 @@ msgstr "No se encontraron contactos."
 msgid "There was an error adding the contact."
 msgstr "Se ha producido un error al añadir el contacto."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "no se ha puesto ningún nombre de elemento."
 
@@ -88,11 +89,11 @@ msgstr "Intentando añadir una propiedad duplicada: "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "La información sobre el vCard es incorrecta. Por favor vuelve a cargar la página."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Error al borrar una propiedad del contacto."
 
@@ -104,19 +105,19 @@ msgstr "Falta la ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Error al analizar el VCard para la ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "no se ha puesto ninguna suma de comprobación."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "La información sobre la vCard es incorrecta. Por favor, recarga la página:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Plof. Algo ha fallado."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Error al actualizar una propiedad del contacto."
 
@@ -165,19 +166,19 @@ msgstr "Fallo al coger las propiedades de la foto ."
 msgid "Error saving contact."
 msgstr "Fallo al salvar un contacto"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Fallo al cambiar de tamaño una foto"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Fallo al cortar el tamaño de la foto"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Fallo al crear la foto temporal"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Fallo al encontrar la imagen"
 
@@ -277,6 +278,10 @@ msgid ""
 "on this server."
 msgstr "El fichero que quieres subir excede el tamaño máximo permitido en este servidor."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Selecciona el tipo"
@@ -379,15 +384,15 @@ msgstr "Cumpleaños"
 
 #: lib/app.php:184
 msgid "Business"
-msgstr ""
+msgstr "Negocio"
 
 #: lib/app.php:185
 msgid "Call"
-msgstr ""
+msgstr "Llamada"
 
 #: lib/app.php:186
 msgid "Clients"
-msgstr ""
+msgstr "Clientes"
 
 #: lib/app.php:187
 msgid "Deliverer"
@@ -395,15 +400,15 @@ msgstr ""
 
 #: lib/app.php:188
 msgid "Holidays"
-msgstr ""
+msgstr "Vacaciones"
 
 #: lib/app.php:189
 msgid "Ideas"
-msgstr ""
+msgstr "Ideas"
 
 #: lib/app.php:190
 msgid "Journey"
-msgstr ""
+msgstr "Jornada"
 
 #: lib/app.php:191
 msgid "Jubilee"
@@ -411,23 +416,23 @@ msgstr ""
 
 #: lib/app.php:192
 msgid "Meeting"
-msgstr ""
+msgstr "Reunión"
 
 #: lib/app.php:193
 msgid "Other"
-msgstr ""
+msgstr "Otro"
 
 #: lib/app.php:194
 msgid "Personal"
-msgstr ""
+msgstr "Personal"
 
 #: lib/app.php:195
 msgid "Projects"
-msgstr ""
+msgstr "Proyectos"
 
 #: lib/app.php:196
 msgid "Questions"
-msgstr ""
+msgstr "Preguntas"
 
 #: lib/hooks.php:102
 msgid "{name}'s Birthday"
@@ -447,7 +452,7 @@ msgstr "Importar"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Configuración"
 
 #: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
@@ -459,19 +464,19 @@ msgstr "Cierra."
 
 #: templates/index.php:37
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Atajos de teclado"
 
 #: templates/index.php:39
 msgid "Navigation"
-msgstr ""
+msgstr "Navegación"
 
 #: templates/index.php:42
 msgid "Next contact in list"
-msgstr ""
+msgstr "Siguiente contacto en la lista"
 
 #: templates/index.php:44
 msgid "Previous contact in list"
-msgstr ""
+msgstr "Anterior contacto en la lista"
 
 #: templates/index.php:46
 msgid "Expand/collapse current addressbook"
@@ -487,15 +492,15 @@ msgstr ""
 
 #: templates/index.php:54
 msgid "Actions"
-msgstr ""
+msgstr "Acciones"
 
 #: templates/index.php:57
 msgid "Refresh contacts list"
-msgstr ""
+msgstr "Refrescar la lista de contactos"
 
 #: templates/index.php:59
 msgid "Add new contact"
-msgstr ""
+msgstr "Añadir un nuevo contacto"
 
 #: templates/index.php:61
 msgid "Add new addressbook"
@@ -503,7 +508,7 @@ msgstr ""
 
 #: templates/index.php:63
 msgid "Delete current contact"
-msgstr ""
+msgstr "Eliminar contacto actual"
 
 #: templates/part.contact.php:17
 msgid "Drop photo to upload"
@@ -535,7 +540,7 @@ msgstr "Editar los detalles del nombre"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Borrar"
 
@@ -549,7 +554,7 @@ msgstr "Introduce un alias"
 
 #: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
-msgstr ""
+msgstr "Sitio Web"
 
 #: templates/part.contact.php:44
 msgid "http://www.somesite.com"
@@ -687,7 +692,7 @@ msgstr "Código postal"
 
 #: templates/part.edit_address_dialog.php:51
 msgid "Postal code"
-msgstr ""
+msgstr "Código postal"
 
 #: templates/part.edit_address_dialog.php:54
 #: templates/part.edit_address_dialog.php:57
@@ -812,11 +817,11 @@ msgstr ""
 
 #: templates/part.selectaddressbook.php:20
 msgid "Enter name"
-msgstr ""
+msgstr "Introducir nombre"
 
 #: templates/part.selectaddressbook.php:22
 msgid "Enter description"
-msgstr ""
+msgstr "Introducir descripción"
 
 #: templates/settings.php:3
 msgid "CardDAV syncing addresses"
@@ -846,30 +851,30 @@ msgstr ""
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nueva libreta de direcciones"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
-msgstr ""
+msgstr "Más..."
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
new file mode 100644
index 00000000000..32c5cd85877
--- /dev/null
+++ b/l10n/es/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
new file mode 100644
index 00000000000..17fbc463fd2
--- /dev/null
+++ b/l10n/es/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
new file mode 100644
index 00000000000..6e4610baa0e
--- /dev/null
+++ b/l10n/es/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
new file mode 100644
index 00000000000..48608fd407b
--- /dev/null
+++ b/l10n/es/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 8c089dee773..6f0dea3abea 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <davidlopez.david@gmail.com>, 2012.
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2011, 2012.
 #   <monty_2731@hotmail.com>, 2011.
@@ -14,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +27,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Imposible cargar la lista desde App Store"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -54,7 +55,7 @@ msgstr "Idioma cambiado"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -76,11 +77,27 @@ msgstr "Castellano"
 msgid "Security Warning"
 msgstr "Advertencia de seguridad"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Más"
 
diff --git a/l10n/es/tasks.po b/l10n/es/tasks.po
new file mode 100644
index 00000000000..79d624ab38e
--- /dev/null
+++ b/l10n/es/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
new file mode 100644
index 00000000000..4b0620e4559
--- /dev/null
+++ b/l10n/es/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/es/user_migrate.po b/l10n/es/user_migrate.po
new file mode 100644
index 00000000000..aba673bd3fe
--- /dev/null
+++ b/l10n/es/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/es/user_openid.po b/l10n/es/user_openid.po
new file mode 100644
index 00000000000..8d6e1cc9088
--- /dev/null
+++ b/l10n/es/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/et_EE/admin_dependencies_chk.po b/l10n/et_EE/admin_dependencies_chk.po
new file mode 100644
index 00000000000..589ff81c369
--- /dev/null
+++ b/l10n/et_EE/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/et_EE/admin_migrate.po b/l10n/et_EE/admin_migrate.po
new file mode 100644
index 00000000000..c6f5f7eb0d8
--- /dev/null
+++ b/l10n/et_EE/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/et_EE/calendar.po b/l10n/et_EE/calendar.po
index 2cca9be319a..9a8efeb0287 100644
--- a/l10n/et_EE/calendar.po
+++ b/l10n/et_EE/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Kalendreid ei leitud."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Üritusi ei leitud."
 
@@ -30,300 +38,394 @@ msgstr "Üritusi ei leitud."
 msgid "Wrong calendar"
 msgstr "Vale kalender"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Uus ajavöönd:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Ajavöönd on muudetud"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Vigane päring"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Sünnipäev"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Äri"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Helista"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Kliendid"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Kohaletoimetaja"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Pühad"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideed"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Reis"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Juubel"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Kohtumine"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Muu"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Isiklik"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projektid"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Küsimused"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Töö"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "nimetu"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Uus kalender"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Ei kordu"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Iga päev"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Iga nädal"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Igal nädalapäeval"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Üle nädala"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Igal kuul"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Igal aastal"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "mitte kunagi"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "toimumiskordade järgi"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "kuupäeva järgi"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "kuu päeva järgi"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "nädalapäeva järgi"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Esmaspäev"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Teisipäev"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Neljapäev"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Reede"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Laupäev"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Pühapäev"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "ürituse kuu nädal"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "esimene"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "teine"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "kolmas"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "neljas"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "viies"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "viimane"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Jaanuar"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Veebruar"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Märts"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Aprill"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mai"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Juuni"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Juuli"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "August"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "September"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Oktoober"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Detsember"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "ürituste kuupäeva järgi"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "aasta päeva(de) järgi"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "nädala numbri(te) järgi"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "kuu ja päeva järgi"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Kuupäev"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Kogu päev"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Uus kalender"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Puuduvad väljad"
@@ -357,40 +459,32 @@ msgstr "Üritus lõpeb enne, kui see algab"
 msgid "There was a database fail"
 msgstr "Tekkis andmebaasi viga"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Nädal"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Kuu"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Nimekiri"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Täna"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendrid"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Faili parsimisel tekkis viga."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Vali aktiivsed kalendrid"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Sinu kalendrid"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav Link"
 
@@ -402,19 +496,19 @@ msgstr "Jagatud kalendrid"
 msgid "No shared calendars"
 msgstr "Jagatud kalendreid pole"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Jaga kalendrit"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Muuda"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Kustuta"
@@ -500,23 +594,23 @@ msgstr "Eralda kategooriad komadega"
 msgid "Edit categories"
 msgstr "Muuda kategooriaid"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Kogu päeva sündmus"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Alates"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Kuni"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Lisavalikud"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Asukoht"
 
@@ -524,7 +618,7 @@ msgstr "Asukoht"
 msgid "Location of the Event"
 msgstr "Sündmuse toimumiskoht"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Kirjeldus"
 
@@ -532,84 +626,86 @@ msgstr "Kirjeldus"
 msgid "Description of the Event"
 msgstr "Sündmuse kirjeldus"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Korda"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Täpsem"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Vali nädalapäevad"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Vali päevad"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "ja ürituse päev aastas."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "ja ürituse päev kuus."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Vali kuud"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Vali nädalad"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "ja ürituse nädal aastas."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervall"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Lõpp"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "toimumiskordi"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "loo uus kalender"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Impordi kalendrifail"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Palun vali kalender"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "loo uus kalender"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Uue kalendri nimi"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Impordi"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Kalendri importimine"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalender on imporditud"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Impordi"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Sulge dialoogiaken"
 
@@ -625,45 +721,73 @@ msgstr "Vaata üritust"
 msgid "No categories selected"
 msgstr "Ühtegi kategooriat pole valitud"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Salvesta kategooria"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "/"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "kell"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Ajavöönd"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Kontrolli alati muudatusi ajavööndis"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Aja vorming"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Nädala esimene päev"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Kalendri CalDAV sünkroniseerimise aadress:"
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index 912ab345d27..74db6a2d970 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Viga aadressiraamatu (de)aktiveerimisel."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID on määramata."
 
@@ -60,7 +60,7 @@ msgstr "Ühtegi kontakti ei leitud."
 msgid "There was an error adding the contact."
 msgstr "Konktakti lisamisel tekkis viga."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "elemendi nime pole määratud."
 
@@ -84,11 +84,11 @@ msgstr "Proovitakse lisada topeltomadust: "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Visiitkaardi info pole korrektne. Palun lae leht uuesti."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Viga konktaki korralikul kustutamisel."
 
@@ -100,19 +100,19 @@ msgstr "Puudub ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Viga VCard-ist ID parsimisel: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "kontrollsummat pole määratud."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCard info pole korrektne. Palun lae lehekülg uuesti: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Midagi läks tõsiselt metsa."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Viga konktaki korralikul uuendamisel."
 
@@ -161,19 +161,19 @@ msgstr "Viga PHOTO omaduse hankimisel."
 msgid "Error saving contact."
 msgstr "Viga kontakti salvestamisel."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Viga pildi suuruse muutmisel"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Viga pildi lõikamisel"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Viga ajutise pildi loomisel"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Viga pildi leidmisel: "
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Vali tüüp"
@@ -531,7 +535,7 @@ msgstr "Muuda nime üksikasju"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Kustuta"
 
@@ -842,30 +846,30 @@ msgstr ""
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Muuda"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Uus aadressiraamat"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Salvesta"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Loobu"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
new file mode 100644
index 00000000000..de81587c37b
--- /dev/null
+++ b/l10n/et_EE/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
new file mode 100644
index 00000000000..3321a99e086
--- /dev/null
+++ b/l10n/et_EE/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
new file mode 100644
index 00000000000..6a3fc45f755
--- /dev/null
+++ b/l10n/et_EE/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
new file mode 100644
index 00000000000..dccf6069c5d
--- /dev/null
+++ b/l10n/et_EE/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 0c380a399f6..e5e997d1396 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,27 @@ msgstr "Eesti"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Veel"
 
diff --git a/l10n/et_EE/tasks.po b/l10n/et_EE/tasks.po
new file mode 100644
index 00000000000..310756cc69e
--- /dev/null
+++ b/l10n/et_EE/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
new file mode 100644
index 00000000000..38de7d5c108
--- /dev/null
+++ b/l10n/et_EE/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/et_EE/user_migrate.po b/l10n/et_EE/user_migrate.po
new file mode 100644
index 00000000000..88aea141386
--- /dev/null
+++ b/l10n/et_EE/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/et_EE/user_openid.po b/l10n/et_EE/user_openid.po
new file mode 100644
index 00000000000..7944fd1d362
--- /dev/null
+++ b/l10n/et_EE/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/eu/admin_dependencies_chk.po b/l10n/eu/admin_dependencies_chk.po
new file mode 100644
index 00000000000..92e7dfc1a3c
--- /dev/null
+++ b/l10n/eu/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/eu/admin_migrate.po b/l10n/eu/admin_migrate.po
new file mode 100644
index 00000000000..c810a7d4520
--- /dev/null
+++ b/l10n/eu/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/eu/calendar.po b/l10n/eu/calendar.po
index 15d3461f55a..9617f72ac3b 100644
--- a/l10n/eu/calendar.po
+++ b/l10n/eu/calendar.po
@@ -10,21 +10,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr "Egutegi guztiak ez daude guztiz cacheatuta"
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr "Dena guztiz cacheatuta dagoela dirudi"
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Ez da egutegirik aurkitu."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Ez da gertaerarik aurkitu."
 
@@ -32,300 +40,394 @@ msgstr "Ez da gertaerarik aurkitu."
 msgid "Wrong calendar"
 msgstr "Egutegi okerra"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr "Fitxategiak ez zuen gertaerarik edo gertaera guztiak dagoeneko egutegian gordeta zeuden."
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr "gertaerak egutegi berrian gorde dira"
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "Inportazioak huts egin du"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "gertaerak zure egutegian gorde dira"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Ordu-zonalde berria"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Ordu-zonaldea aldatuta"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Baliogabeko eskaera"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Egutegia"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "yyyy MMMM"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Jaioteguna"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Negozioa"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Deia"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Bezeroak"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Banatzailea"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Oporrak"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideiak"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Bidaia"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Urteurrena"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Bilera"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Bestelakoa"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Pertsonala"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Proiektuak"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Galderak"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Lana"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "izengabea"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Egutegi berria"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Ez da errepikatzen"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Egunero"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Astero"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Asteko egun guztietan"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Bi-Astero"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Hilabetero"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Urtero"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "inoiz"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "errepikapen kopuruagatik"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "dataren arabera"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "hileko egunaren arabera"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "asteko egunaren arabera"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Astelehena"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Asteartea"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Asteazkena"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Osteguna"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Ostirala"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Larunbata"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Igandea"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "gertaeraren hilabeteko astea"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "lehenengoa"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "bigarrean"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "hirugarrena"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "laugarrena"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "bostgarrena"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "azkena"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Urtarrila"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Otsaila"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Martxoa"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Apirila"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Maiatza"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Ekaina"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Uztaila"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Abuztua"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Iraila"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Urria"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Azaroa"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Abendua"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "gertaeren dataren arabera"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "urteko egunaren arabera"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "aste zenbaki(ar)en arabera"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "eguna eta hilabetearen arabera"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Data"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Eg."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "ig."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "al."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "ar."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "az."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "og."
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "ol."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "lr."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "urt."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "ots."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "mar."
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "api."
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "mai."
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "eka."
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "uzt."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "abu."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "ira."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "urr."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "aza."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "abe."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Egun guztia"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Egutegi berria"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Eremuak faltan"
@@ -359,40 +461,32 @@ msgstr "Gertaera hasi baino lehen bukatzen da"
 msgid "There was a database fail"
 msgstr "Datu-baseak huts egin du"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Astea"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Hilabetea"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Zerrenda"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Gaur"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Egutegiak"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Huts bat egon da, fitxategia aztertzen zen bitartea."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Aukeratu egutegi aktiboak"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Zure egutegiak"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav lotura"
 
@@ -404,19 +498,19 @@ msgstr "Elkarbanatutako egutegiak"
 msgid "No shared calendars"
 msgstr "Ez dago elkarbanatutako egutegirik"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Elkarbanatu egutegia"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Editatu"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Ezabatu"
@@ -502,23 +596,23 @@ msgstr "Banatu kategoriak komekin"
 msgid "Edit categories"
 msgstr "Editatu kategoriak"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Egun osoko gertaera"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Hasiera"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Bukaera"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Aukera aurreratuak"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Kokalekua"
 
@@ -526,7 +620,7 @@ msgstr "Kokalekua"
 msgid "Location of the Event"
 msgstr "Gertaeraren kokalekua"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Deskribapena"
 
@@ -534,84 +628,86 @@ msgstr "Deskribapena"
 msgid "Description of the Event"
 msgstr "Gertaeraren deskribapena"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Errepikatu"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Hautatu asteko egunak"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Hautatu egunak"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "eta gertaeraren urteko eguna."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "eta gertaeraren hilabeteko eguna."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Hautatu hilabeteak"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Hautatu asteak"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "eta gertaeraren urteko astea."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Tartea"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Amaiera"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "errepikapenak"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "sortu egutegi berria"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Inportatu egutegi fitxategi bat"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Mesedez aukeratu egutegia"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "sortu egutegi berria"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "Mesedez aukeratu egutegi bat."
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Egutegi berriaren izena"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importatu"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr "Hartu eskuragarri dagoen izen bat!"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Egutegia inportatzen"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr "Izen hau duen egutegi bat dagoeneko existitzen da. Hala ere jarraitzen baduzu, egutegi hauek elkartuko dira."
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Egutegia ongi inportatu da"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Importatu"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Itxi lehioa"
 
@@ -627,45 +723,73 @@ msgstr "Ikusi gertaera bat"
 msgid "No categories selected"
 msgstr "Ez da kategoriarik hautatu"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Aukeratu kategoria"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Ordu-zonaldea"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Egiaztatu beti ordu-zonalde aldaketen bila"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Ordu formatua"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Asteko lehenego eguna"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr "Cache"
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr "Ezabatu gertaera errepikakorren cachea"
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Egutegiaren CalDAV sinkronizazio helbidea"
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr "Egutegiaren CalDAV sinkronizazio helbideak"
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr "informazio gehiago"
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr "Helbide nagusia"
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index 64cdef7d1a0..df6730af068 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Errore bat egon da helbide-liburua (des)gaitzen"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "IDa ez da ezarri."
 
@@ -62,7 +62,7 @@ msgstr "Ez da kontakturik aurkitu."
 msgid "There was an error adding the contact."
 msgstr "Errore bat egon da kontaktua gehitzerakoan"
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "elementuaren izena ez da ezarri."
 
@@ -86,11 +86,11 @@ msgstr "Propietate bikoiztuta gehitzen saiatzen ari zara:"
 msgid "Error adding contact property: "
 msgstr "Errore bat egon da kontaktuaren propietatea gehitzean:"
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Errorea kontaktu propietatea ezabatzean."
 
@@ -102,19 +102,19 @@ msgstr "ID falta da"
 msgid "Error parsing VCard for ID: \""
 msgstr "Errorea VCard analizatzean hurrengo IDrako: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "Kontrol-batura ezarri gabe dago."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCard honen informazioa ez da zuzena.Mezedez birkargatu orria:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Errorea kontaktu propietatea eguneratzean."
 
@@ -163,19 +163,19 @@ msgstr "Errore bat izan da PHOTO propietatea lortzean."
 msgid "Error saving contact."
 msgstr "Errore bat izan da kontaktua gordetzean."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Errore bat izan da irudiaren tamaina aldatzean"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Errore bat izan da irudia mozten"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Errore bat izan da aldi bateko irudia sortzen"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Ezin izan da irudia aurkitu:"
 
@@ -275,6 +275,10 @@ msgid ""
 "on this server."
 msgstr "Igo nahi duzun fitxategia zerbitzariak onartzen duen tamaina baino handiagoa da."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Hautatu mota"
@@ -533,7 +537,7 @@ msgstr "Editatu izenaren zehaztasunak"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Ezabatu"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Editatu"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Helbide-liburu berria"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Gorde"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Ezeztatu"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
new file mode 100644
index 00000000000..7b883fb9a8d
--- /dev/null
+++ b/l10n/eu/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
new file mode 100644
index 00000000000..488f5829183
--- /dev/null
+++ b/l10n/eu/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
new file mode 100644
index 00000000000..1851e89cc88
--- /dev/null
+++ b/l10n/eu/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po
new file mode 100644
index 00000000000..d2da93b8df5
--- /dev/null
+++ b/l10n/eu/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 89f2191352d..fc694e55594 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -72,11 +72,27 @@ msgstr "Euskera"
 msgid "Security Warning"
 msgstr "Segurtasun abisua"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Egunkaria"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Gehiago"
 
diff --git a/l10n/eu/tasks.po b/l10n/eu/tasks.po
new file mode 100644
index 00000000000..4ed8bae41d3
--- /dev/null
+++ b/l10n/eu/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
new file mode 100644
index 00000000000..a948e44d5cf
--- /dev/null
+++ b/l10n/eu/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/eu/user_migrate.po b/l10n/eu/user_migrate.po
new file mode 100644
index 00000000000..395533a4806
--- /dev/null
+++ b/l10n/eu/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/eu/user_openid.po b/l10n/eu/user_openid.po
new file mode 100644
index 00000000000..917f83859aa
--- /dev/null
+++ b/l10n/eu/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/eu_ES/admin_dependencies_chk.po b/l10n/eu_ES/admin_dependencies_chk.po
new file mode 100644
index 00000000000..931550cd288
--- /dev/null
+++ b/l10n/eu_ES/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/eu_ES/admin_migrate.po b/l10n/eu_ES/admin_migrate.po
new file mode 100644
index 00000000000..9bc05a4241e
--- /dev/null
+++ b/l10n/eu_ES/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/eu_ES/calendar.po b/l10n/eu_ES/calendar.po
index 3a9d6f6d233..24f487f526e 100644
--- a/l10n/eu_ES/calendar.po
+++ b/l10n/eu_ES/calendar.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-09-03 16:52+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "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"
@@ -69,31 +69,30 @@ msgstr ""
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
@@ -218,7 +217,7 @@ msgstr ""
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
@@ -242,7 +241,7 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
@@ -459,32 +458,24 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:44
-msgid "Today"
-msgstr ""
-
 #: templates/calendar.php:45
-msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
+msgid "Today"
 msgstr ""
 
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
 #: templates/part.choosecalendar.php:2
@@ -737,55 +728,63 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/eu_ES/contacts.po b/l10n/eu_ES/contacts.po
index 840b293048d..c0c80cfb384 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -530,7 +534,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
@@ -841,30 +845,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/eu_ES/files_encryption.po b/l10n/eu_ES/files_encryption.po
new file mode 100644
index 00000000000..04e045a38ef
--- /dev/null
+++ b/l10n/eu_ES/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/eu_ES/files_external.po b/l10n/eu_ES/files_external.po
new file mode 100644
index 00000000000..37af2e3b7fa
--- /dev/null
+++ b/l10n/eu_ES/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/eu_ES/files_sharing.po b/l10n/eu_ES/files_sharing.po
new file mode 100644
index 00000000000..a9203e1818f
--- /dev/null
+++ b/l10n/eu_ES/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/eu_ES/files_versions.po b/l10n/eu_ES/files_versions.po
new file mode 100644
index 00000000000..e27dd7812a5
--- /dev/null
+++ b/l10n/eu_ES/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index 571fd1f6aaf..d750261466f 100644
--- a/l10n/eu_ES/settings.po
+++ b/l10n/eu_ES/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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -69,11 +69,27 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/eu_ES/tasks.po b/l10n/eu_ES/tasks.po
new file mode 100644
index 00000000000..aad5eb88c31
--- /dev/null
+++ b/l10n/eu_ES/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/eu_ES/user_ldap.po b/l10n/eu_ES/user_ldap.po
new file mode 100644
index 00000000000..34f25c3435d
--- /dev/null
+++ b/l10n/eu_ES/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/eu_ES/user_migrate.po b/l10n/eu_ES/user_migrate.po
new file mode 100644
index 00000000000..7a3cda23096
--- /dev/null
+++ b/l10n/eu_ES/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/eu_ES/user_openid.po b/l10n/eu_ES/user_openid.po
new file mode 100644
index 00000000000..7016da797dd
--- /dev/null
+++ b/l10n/eu_ES/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/fa/admin_dependencies_chk.po b/l10n/fa/admin_dependencies_chk.po
new file mode 100644
index 00000000000..265e0c6cd7c
--- /dev/null
+++ b/l10n/fa/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/fa/admin_migrate.po b/l10n/fa/admin_migrate.po
new file mode 100644
index 00000000000..6b80ec8ecaf
--- /dev/null
+++ b/l10n/fa/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/fa/calendar.po b/l10n/fa/calendar.po
index 36e72a92623..1702670824e 100644
--- a/l10n/fa/calendar.po
+++ b/l10n/fa/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "هیچ تقویمی پیدا نشد"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "هیچ رویدادی پیدا نشد"
 
@@ -30,300 +38,394 @@ msgstr "هیچ رویدادی پیدا نشد"
 msgid "Wrong calendar"
 msgstr "تقویم اشتباه"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "زمان محلی جدید"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "زمان محلی تغییر یافت"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "درخواست نامعتبر"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "تقویم"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "DDD m[ yyyy]{ '&#8212;'[ DDD] m yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "روزتولد"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "تجارت"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "تماس گرفتن"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "مشتریان"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "نجات"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "روزهای تعطیل"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "ایده ها"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "سفر"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "سالگرد"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "ملاقات"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "دیگر"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "شخصی"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "پروژه ها"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "سوالات"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "کار"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "نام گذاری نشده"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "تقویم جدید"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "تکرار نکنید"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "روزانه"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "هفتهگی"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "هرروز هفته"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "دوهفته"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "ماهانه"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "سالانه"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "هرگز"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "به وسیله ظهور"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "به وسیله تاریخ"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "به وسیله روزهای ماه"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "به وسیله روز های هفته"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "دوشنبه"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "سه شنبه"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "چهارشنبه"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "پنجشنبه"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "جمعه"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "شنبه"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "یکشنبه"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "رویداد های  هفته هایی از ماه"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "اولین"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "دومین"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "سومین"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "چهارمین"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "پنجمین"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "آخرین"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "ژانویه"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "فبریه"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "مارس"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "آوریل"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "می"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "ژوءن"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "جولای"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "آگوست"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "سپتامبر"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "اکتبر"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "نوامبر"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "دسامبر"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "به وسیله رویداد های روزانه"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "به وسیله روز های سال(ها)"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "به وسیله شماره هفته(ها)"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "به وسیله روز و ماه"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "تاریخ"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "تقویم."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "هرروز"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "تقویم جدید"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "فیلد های گم شده"
@@ -357,40 +459,32 @@ msgstr "رویداد قبل از شروع شدن تمام شده!"
 msgid "There was a database fail"
 msgstr "یک پایگاه داده فرو مانده است"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "هفته"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "ماه"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "فهرست"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "امروز"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "تقویم ها"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "ناتوان در تجزیه پرونده"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "تقویم فعال را انتخاب کنید"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "تقویم های شما"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav Link"
 
@@ -402,19 +496,19 @@ msgstr "تقویمهای به اشترک گذاری شده"
 msgid "No shared calendars"
 msgstr "هیچ تقویمی به  اشتراک گذارده نشده"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "تقویم را به اشتراک بگذارید"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "بارگیری"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "ویرایش"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "پاک کردن"
@@ -500,23 +594,23 @@ msgstr "گروه ها را به وسیله درنگ نما از هم جدا کن
 msgid "Edit categories"
 msgstr "ویرایش گروه"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "رویداد های روزانه"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "از"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "به"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "تنظیمات حرفه ای"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "منطقه"
 
@@ -524,7 +618,7 @@ msgstr "منطقه"
 msgid "Location of the Event"
 msgstr "منطقه رویداد"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "توضیحات"
 
@@ -532,84 +626,86 @@ msgstr "توضیحات"
 msgid "Description of the Event"
 msgstr "توضیحات درباره رویداد"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "تکرار"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "پیشرفته"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "انتخاب روز های هفته "
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "انتخاب روز ها"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "و رویداد های روز از سال"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "و رویداد های روز از ماه"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "انتخاب ماه ها"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "انتخاب هفته ها"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "و رویداد هفته ها از سال"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "فاصله"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "پایان"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "ظهور"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "یک تقویم جدید ایجاد کنید"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "یک پرونده حاوی تقویم وارد کنید"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "لطفا تقویم را انتخاب کنید"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "یک تقویم جدید ایجاد کنید"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "نام تقویم جدید"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "ورودی دادن"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "درحال افزودن تقویم"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "افزودن تقویم موفقیت آمیز بود"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "ورودی دادن"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "بستن دیالوگ"
 
@@ -625,45 +721,73 @@ msgstr "دیدن یک رویداد"
 msgid "No categories selected"
 msgstr "هیچ گروهی انتخاب نشده"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "انتخاب گروه"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "از"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "در"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "زمان محلی"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "همیشه بررسی کنید برای تغییر زمان محلی"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "نوع زمان"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24 ساعت"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12 ساعت"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "یکمین روز هفته"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Calendar CalDAV syncing address :"
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/fa/contacts.po b/l10n/fa/contacts.po
index 7b2e343e519..585d7ae6c29 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr "خطا در (غیر) فعال سازی کتابچه نشانه ها"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "شناسه تعیین نشده"
 
@@ -60,7 +60,7 @@ msgstr "هیچ شخصی پیدا نشد"
 msgid "There was an error adding the contact."
 msgstr "یک خطا در افزودن اطلاعات شخص مورد نظر"
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "نام اصلی تنظیم نشده است"
 
@@ -84,11 +84,11 @@ msgstr "امتحان کردن برای وارد کردن مشخصات تکرار
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "اطلاعات درمورد vCard شما اشتباه است لطفا صفحه را دوباره بار گذاری کنید"
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "خطا در هنگام پاک کرد ویژگی"
 
@@ -100,19 +100,19 @@ msgstr "نشانی گم شده"
 msgid "Error parsing VCard for ID: \""
 msgstr "خطا در تجزیه کارت ویزا برای شناسه:"
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "checksum تنظیم شده نیست"
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "اطلاعات کارت ویزا شما غلط است لطفا صفحه را دوباره بارگزاری کنید"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "چند چیز به FUBAR رفتند"
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "خطا در هنگام بروزرسانی  اطلاعات شخص مورد نظر"
 
@@ -161,19 +161,19 @@ msgstr "خطا در دربافت تصویر ویژگی شخصی"
 msgid "Error saving contact."
 msgstr "خطا در ذخیره سازی اطلاعات"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "خطا در تغییر دادن اندازه تصویر"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "خطا در برداشت تصویر"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "خطا در ساخت تصویر  temporary"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "خطا در پیدا کردن تصویر:"
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr "حجم فایل بسیار بیشتر از حجم تنظیم شده در تنظیمات سرور است"
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "نوع را انتخاب کنید"
@@ -531,7 +535,7 @@ msgstr "ویرایش نام جزئیات"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "پاک کردن"
 
@@ -842,30 +846,30 @@ msgstr ""
 msgid "Download"
 msgstr "بارگیری"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "ویرایش"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "کتابچه نشانه های جدید"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "ذخیره سازی"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "انصراف"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
new file mode 100644
index 00000000000..ff23cb72c96
--- /dev/null
+++ b/l10n/fa/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po
new file mode 100644
index 00000000000..7e4183a71b1
--- /dev/null
+++ b/l10n/fa/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
new file mode 100644
index 00000000000..8afa64d981c
--- /dev/null
+++ b/l10n/fa/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/fa/files_versions.po b/l10n/fa/files_versions.po
new file mode 100644
index 00000000000..8fe77cc79fe
--- /dev/null
+++ b/l10n/fa/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 1959264ab44..0c86f804605 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-07 02:05+0200\n"
-"PO-Revision-Date: 2012-08-06 01:13+0000\n"
-"Last-Translator: vahid chakoshy <vchakoshy@gmail.com>\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -71,11 +71,27 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr "اخطار امنیتی"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "کارنامه"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "بیشتر"
 
diff --git a/l10n/fa/tasks.po b/l10n/fa/tasks.po
new file mode 100644
index 00000000000..a8a28b716d0
--- /dev/null
+++ b/l10n/fa/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
new file mode 100644
index 00000000000..eb2a0fd767f
--- /dev/null
+++ b/l10n/fa/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/fa/user_migrate.po b/l10n/fa/user_migrate.po
new file mode 100644
index 00000000000..dbd3fc6600f
--- /dev/null
+++ b/l10n/fa/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/fa/user_openid.po b/l10n/fa/user_openid.po
new file mode 100644
index 00000000000..abfc372d3c7
--- /dev/null
+++ b/l10n/fa/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/fi/admin_dependencies_chk.po b/l10n/fi/admin_dependencies_chk.po
new file mode 100644
index 00000000000..c3fe2f98228
--- /dev/null
+++ b/l10n/fi/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/fi/admin_migrate.po b/l10n/fi/admin_migrate.po
new file mode 100644
index 00000000000..3aea7a7ce5d
--- /dev/null
+++ b/l10n/fi/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/fi/calendar.po b/l10n/fi/calendar.po
index 8bf64c073a3..9b551fc88c9 100644
--- a/l10n/fi/calendar.po
+++ b/l10n/fi/calendar.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-09 02:02+0200\n"
-"PO-Revision-Date: 2011-09-03 16:52+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,31 +69,30 @@ msgstr ""
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
@@ -218,7 +217,7 @@ msgstr ""
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
@@ -242,7 +241,7 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
@@ -459,32 +458,24 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:44
-msgid "Today"
-msgstr ""
-
 #: templates/calendar.php:45
-msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
+msgid "Today"
 msgstr ""
 
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
 #: templates/part.choosecalendar.php:2
@@ -737,55 +728,63 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/fi/contacts.po b/l10n/fi/contacts.po
index d981913ecce..537fe182c32 100644
--- a/l10n/fi/contacts.po
+++ b/l10n/fi/contacts.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-09 02:02+0200\n"
-"PO-Revision-Date: 2011-09-23 17:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
diff --git a/l10n/fi/files_encryption.po b/l10n/fi/files_encryption.po
new file mode 100644
index 00000000000..8aa6088c38e
--- /dev/null
+++ b/l10n/fi/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/fi/files_external.po b/l10n/fi/files_external.po
new file mode 100644
index 00000000000..6b036592f0c
--- /dev/null
+++ b/l10n/fi/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/fi/files_sharing.po b/l10n/fi/files_sharing.po
new file mode 100644
index 00000000000..375cb6c6e37
--- /dev/null
+++ b/l10n/fi/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/fi/files_versions.po b/l10n/fi/files_versions.po
new file mode 100644
index 00000000000..89bfb8144e6
--- /dev/null
+++ b/l10n/fi/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/fi/settings.po b/l10n/fi/settings.po
index 940a5cbc09c..c7d75c2d6ac 100644
--- a/l10n/fi/settings.po
+++ b/l10n/fi/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-09 02:02+0200\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,11 +69,27 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/fi/tasks.po b/l10n/fi/tasks.po
new file mode 100644
index 00000000000..91f222dac37
--- /dev/null
+++ b/l10n/fi/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/fi/user_ldap.po b/l10n/fi/user_ldap.po
new file mode 100644
index 00000000000..70707a1d170
--- /dev/null
+++ b/l10n/fi/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/fi/user_migrate.po b/l10n/fi/user_migrate.po
new file mode 100644
index 00000000000..cd3ef8ef5a9
--- /dev/null
+++ b/l10n/fi/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/fi/user_openid.po b/l10n/fi/user_openid.po
new file mode 100644
index 00000000000..a6f5b6048de
--- /dev/null
+++ b/l10n/fi/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/fi_FI/admin_dependencies_chk.po b/l10n/fi_FI/admin_dependencies_chk.po
new file mode 100644
index 00000000000..46b0ad55d7c
--- /dev/null
+++ b/l10n/fi_FI/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/fi_FI/admin_migrate.po b/l10n/fi_FI/admin_migrate.po
new file mode 100644
index 00000000000..ba949be0876
--- /dev/null
+++ b/l10n/fi_FI/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/fi_FI/calendar.po b/l10n/fi_FI/calendar.po
index d280acc0f28..f8b5e83e77b 100644
--- a/l10n/fi_FI/calendar.po
+++ b/l10n/fi_FI/calendar.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:03+0200\n"
-"PO-Revision-Date: 2012-07-28 15:53+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "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"
@@ -72,31 +72,30 @@ msgstr "Virheellinen pyyntö"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
@@ -221,7 +220,7 @@ msgstr ""
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Maanantai"
 
@@ -245,7 +244,7 @@ msgstr "Perjantai"
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Sunnuntai"
 
@@ -462,33 +461,25 @@ msgstr "Tapahtuma päättyy ennen alkamistaan"
 msgid "There was a database fail"
 msgstr "Tapahtui tietokantavirhe"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Viikko"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Kuukausi"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Tänään"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Kalenterit"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Tiedostoa jäsennettäessä tapahtui virhe."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Valitse aktiiviset kalenterit"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -740,55 +731,63 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Tarkista aina aikavyöhykkeen muutokset"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Ajan esitysmuoto"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24 tuntia"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12 tuntia"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Viikon ensimmäinen päivä"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr "Kalenterin CalDAV-synkronointiosoitteet"
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/fi_FI/contacts.po b/l10n/fi_FI/contacts.po
index 43e05ac6eea..35b090e46b3 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -45,7 +45,7 @@ msgstr ""
 
 #: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Virhe asettaessa tarkistussummaa."
 
 #: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
@@ -63,7 +63,7 @@ msgstr "Yhteystietoja ei löytynyt."
 msgid "There was an error adding the contact."
 msgstr "Virhe yhteystietoa lisättäessä."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -87,11 +87,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCardin tiedot eivät kelpaa. Lataa sivu uudelleen."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Virhe poistettaessa yhteystiedon ominaisuutta."
 
@@ -103,19 +103,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr "Virhe jäsennettäessä vCardia tunnisteelle: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Virhe päivitettäessä yhteystiedon ominaisuutta."
 
@@ -142,7 +142,7 @@ msgstr ""
 
 #: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
-msgstr ""
+msgstr "Kuvan polkua ei annettu."
 
 #: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
@@ -164,19 +164,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr "Virhe yhteystietoa tallennettaessa."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Virhe asettaessa kuvaa uuteen kokoon"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Virhe rajatessa kuvaa"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Virhe luotaessa väliaikaista kuvaa"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -212,11 +212,11 @@ msgstr "Tilapäiskansio puuttuu"
 
 #: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Väliaikaiskuvan tallennus epäonnistui:"
 
 #: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Väliaikaiskuvan lataus epäonnistui:"
 
 #: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
@@ -276,6 +276,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -284,7 +288,7 @@ msgstr ""
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
-msgstr ""
+msgstr "Jotkin yhteystiedot on merkitty poistettaviksi, mutta niitä ei ole vielä poistettu. Odota hetki, että kyseiset yhteystiedot poistetaan."
 
 #: js/loader.js:49
 msgid "Result: "
@@ -478,11 +482,11 @@ msgstr ""
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Seuraava osoitekirja"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Edellinen osoitekirja"
 
 #: templates/index.php:54
 msgid "Actions"
@@ -534,7 +538,7 @@ msgstr "Muokkaa nimitietoja"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Poista"
 
@@ -845,30 +849,30 @@ msgstr "Näytä vain luku -muodossa oleva VCF-linkki"
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr "Nimi"
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr "Kuvaus"
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Tallenna"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Peru"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr "Lisää..."
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
new file mode 100644
index 00000000000..62b43dfc312
--- /dev/null
+++ b/l10n/fi_FI/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
new file mode 100644
index 00000000000..101691c0784
--- /dev/null
+++ b/l10n/fi_FI/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
new file mode 100644
index 00000000000..defc8793baa
--- /dev/null
+++ b/l10n/fi_FI/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/fi_FI/files_versions.po b/l10n/fi_FI/files_versions.po
new file mode 100644
index 00000000000..678c8cda62e
--- /dev/null
+++ b/l10n/fi_FI/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 25c546781eb..0649c23395d 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-07 02:05+0200\n"
-"PO-Revision-Date: 2012-08-06 10:15+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "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"
@@ -71,11 +71,27 @@ msgstr "_kielen_nimi_"
 msgid "Security Warning"
 msgstr "Turvallisuusvaroitus"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Loki"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Lisää"
 
diff --git a/l10n/fi_FI/tasks.po b/l10n/fi_FI/tasks.po
new file mode 100644
index 00000000000..0e179f0b479
--- /dev/null
+++ b/l10n/fi_FI/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
new file mode 100644
index 00000000000..601e9c1d35e
--- /dev/null
+++ b/l10n/fi_FI/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/fi_FI/user_migrate.po b/l10n/fi_FI/user_migrate.po
new file mode 100644
index 00000000000..17bff479f0d
--- /dev/null
+++ b/l10n/fi_FI/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/fi_FI/user_openid.po b/l10n/fi_FI/user_openid.po
new file mode 100644
index 00000000000..7b5195bbccd
--- /dev/null
+++ b/l10n/fi_FI/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/fr/admin_dependencies_chk.po b/l10n/fr/admin_dependencies_chk.po
new file mode 100644
index 00000000000..36480849bec
--- /dev/null
+++ b/l10n/fr/admin_dependencies_chk.po
@@ -0,0 +1,74 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 15:59+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr "Le module php-json est requis pour l'inter-communication de nombreux modules."
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr "Le module php-curl est requis afin de rapatrier le titre des pages lorsque vous ajoutez un marque-pages."
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr "Le module php-gd est requis afin de permettre la création d'aperçus pour vos images."
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr "Le module php-ldap est requis afin de permettre la connexion à votre serveur ldap."
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr "Le module php-zip est requis pour le téléchargement simultané de plusieurs fichiers."
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr "Le module php-mb_multibyte est requis pour une gestion correcte des encodages."
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr "Le module php-ctype est requis pour la validation des données."
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr "Le module php-xml est requis pour le partage de fichiers via webdav."
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr "La directive allow_url_fopen de votre fichier php.ini doit être à la valeur 1 afin de permettre le rapatriement de la base de connaissance depuis les serveurs OCS."
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr "le module php-pdo est requis pour le stockage des données ownCloud en base de données."
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr "Statut des dépendances"
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr "Utilisé par :"
diff --git a/l10n/fr/admin_migrate.po b/l10n/fr/admin_migrate.po
new file mode 100644
index 00000000000..a3f34310cc1
--- /dev/null
+++ b/l10n/fr/admin_migrate.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 15:51+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr "Exporter cette instance ownCloud"
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr "Ceci va créer une archive compressée contenant les données de cette instance ownCloud.\n            Veuillez choisir le type d'export :"
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr "Exporter"
diff --git a/l10n/fr/calendar.po b/l10n/fr/calendar.po
index 00c24da8a97..c69485641c7 100644
--- a/l10n/fr/calendar.po
+++ b/l10n/fr/calendar.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-30 13:48+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "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"
@@ -78,31 +78,30 @@ msgstr "Requête invalide"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr "ddd d/M"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr "dddd d/M"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr "dddd, d MMM, yyyy"
 
@@ -227,7 +226,7 @@ msgstr "par jour du mois"
 msgid "by weekday"
 msgstr "par jour de la semaine"
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Lundi"
 
@@ -251,7 +250,7 @@ msgstr "Vendredi"
 msgid "Saturday"
 msgstr "Samedi"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Dimanche"
 
@@ -468,33 +467,25 @@ msgstr "L'évènement s'est terminé avant qu'il ne commence"
 msgid "There was a database fail"
 msgstr "Il y a eu un échec dans la base de donnée"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Semaine"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mois"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Calendriers"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Une erreur est survenue pendant la lecture du fichier."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Choix des calendriers actifs"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -746,55 +737,63 @@ msgstr "de"
 msgid "at"
 msgstr "à"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Fuseau horaire"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Toujours vérifier d'éventuels changements de fuseau horaire"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Format de l'heure"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Premier jour de la semaine"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr "Cache"
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr "Nettoyer le cache des événements répétitifs"
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr "Adresses de synchronisation des calendriers CalDAV"
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr "plus d'infos"
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr "Adresses principales (Kontact et assimilés)"
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr "lien(s) iCalendar en lecture seule"
 
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 6d0c2315d9d..6680c0a1830 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-07 02:04+0200\n"
-"PO-Revision-Date: 2012-08-06 20:28+0000\n"
-"Last-Translator: Cyril Glapa <kyriog@gmail.com>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "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"
@@ -33,8 +33,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "L'ID n'est pas défini."
 
@@ -70,7 +70,7 @@ msgstr "Aucun contact trouvé."
 msgid "There was an error adding the contact."
 msgstr "Une erreur s'est produite lors de l'ajout du contact."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "Le champ Nom n'est pas défini."
 
@@ -94,11 +94,11 @@ 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/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Les informations relatives à cette vCard sont incorrectes. Veuillez recharger la page."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Erreur lors de la suppression du champ."
 
@@ -110,19 +110,19 @@ msgstr "ID manquant"
 msgid "Error parsing VCard for ID: \""
 msgstr "Erreur lors de l'analyse du VCard pour l'ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "L'hachage n'est pas défini."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir la page:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Quelque chose est FUBAR."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Erreur lors de la mise à jour du champ."
 
@@ -171,19 +171,19 @@ msgstr "Erreur lors de l'obtention des propriétés de la photo"
 msgid "Error saving contact."
 msgstr "Erreur de sauvegarde du contact"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Erreur de redimensionnement de l'image"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Erreur lors du rognage de l'image"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Erreur de création de l'image temporaire"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Erreur pour trouver l'image :"
 
@@ -283,6 +283,10 @@ msgid ""
 "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:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Sélectionner un type"
@@ -291,7 +295,7 @@ msgstr "Sélectionner un type"
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
-msgstr ""
+msgstr "Certains contacts sont marqués pour être supprimés mais sont encore présents, veuillez attendre que l'opération se termine."
 
 #: js/loader.js:49
 msgid "Result: "
@@ -846,7 +850,7 @@ msgstr "Afficher le lien CardDav"
 
 #: templates/settings.php:23
 msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Afficher les liens VCF en lecture seule"
 
 #: templates/settings.php:26
 msgid "Download"
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
new file mode 100644
index 00000000000..cbad09601fc
--- /dev/null
+++ b/l10n/fr/files_encryption.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 16:26+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr "Chiffrement"
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr "Ne pas chiffrer les fichiers dont les types sont les suivants"
+
+#: templates/settings.php:5
+msgid "None"
+msgstr "Aucun"
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr "Activer le chiffrement"
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
new file mode 100644
index 00000000000..488a6924a4d
--- /dev/null
+++ b/l10n/fr/files_external.po
@@ -0,0 +1,83 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 16:35+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr "Stockage externe"
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr "Point de montage"
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr "Infrastructure"
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr "Configuration"
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr "Options"
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr "Disponible"
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr "Ajouter un point de montage"
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr "Aucun spécifié"
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr "Tous les utilisateurs"
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr "Groupes"
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr "Utilisateurs"
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr "Supprimer"
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr "Certificats racine SSL"
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr "Importer un certificat racine"
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr "Activer le stockage externe pour les utilisateurs"
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr "Autoriser les utilisateurs à monter leur propre stockage externe"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
new file mode 100644
index 00000000000..60c8ad25a55
--- /dev/null
+++ b/l10n/fr/files_sharing.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 16:40+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr "Vos documents partagés"
+
+#: templates/list.php:6
+msgid "Item"
+msgstr "Item"
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr "Partagé avec"
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr "Permissions"
+
+#: templates/list.php:16
+msgid "Read"
+msgstr "Lecture"
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr "Édition"
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Effacement"
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr "Permettre le repartage"
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr "Permettre aux utilisateurs de repartager des fichiers dont ils ne sont pas propriétaires"
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
new file mode 100644
index 00000000000..74b1426e8c5
--- /dev/null
+++ b/l10n/fr/files_versions.po
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 16:49+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr "Supprimer les versions intermédiaires"
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr "Activer le versionnage"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 5904706ab71..6682f4c9e0a 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-07 02:05+0200\n"
-"PO-Revision-Date: 2012-08-06 20:25+0000\n"
-"Last-Translator: Cyril Glapa <kyriog@gmail.com>\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "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"
@@ -77,11 +77,27 @@ msgstr "Français"
 msgid "Security Warning"
 msgstr "Alertes de sécurité"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Journaux"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Plus"
 
diff --git a/l10n/fr/tasks.po b/l10n/fr/tasks.po
new file mode 100644
index 00000000000..5fd69298928
--- /dev/null
+++ b/l10n/fr/tasks.po
@@ -0,0 +1,107 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 15:49+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr "date/heure invalide"
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr "Tâches"
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr "Sans catégorie"
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr "Non spécifié"
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr "1=le plus important"
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr "5=importance moyenne"
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr "9=le moins important"
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr "Résumé vide"
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr "Pourcentage d'achèvement invalide"
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr "Priorité invalide"
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr "Ajouter une tâche"
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr "Chargement des tâches…"
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr "Important"
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr "Plus"
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr "Moins"
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr "Supprimer"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
new file mode 100644
index 00000000000..afaa4b5d413
--- /dev/null
+++ b/l10n/fr/user_ldap.po
@@ -0,0 +1,165 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <zrk951@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 17:06+0000\n"
+"Last-Translator: Zertrin <zrk951@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr "Hôte"
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://"
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr "DN de base"
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr "Vous pouvez spécifier le DN de base pour les utilisateurs et les groupes dans l'onglet Avancé"
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr "DN Utilisateur"
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr "Le DN de l'utilisateur client avec lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour l'accès anonyme, laisser le DN et le mot de passe vides."
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr "Mot de passe"
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr "Pour l'accès anonyme, laisser le DN et le mot de passe vides."
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr "Filtre d'identifiants utilisateur"
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr "Filtre d'utilisateurs"
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr "Définit le filtre à appliquer lors de la récupération des utilisateurs."
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr "sans élément de substitution, par exemple \"objectClass=person\"."
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr "Filtre de groupes"
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr "Définit le filtre à appliquer lors de la récupération des groupes."
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr "sans élément de substitution, par exemple \"objectClass=posixGroup\"."
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr "Port"
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr "Association groupe-membre"
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr "Utiliser TLS"
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr "Ne pas utiliser pour les connexions SSL, car cela échouera."
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr "Serveur LDAP insensible à la casse (Windows)"
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr "Désactiver la validation du certificat SSL"
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud."
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr "Non recommendé, utilisation pour tests uniquement."
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud"
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud"
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr "en octets"
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr "en secondes. Tout changement vide le cache."
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr "Aide"
diff --git a/l10n/fr/user_migrate.po b/l10n/fr/user_migrate.po
new file mode 100644
index 00000000000..6528dc9e745
--- /dev/null
+++ b/l10n/fr/user_migrate.po
@@ -0,0 +1,52 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 16:23+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr "Exporter"
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr "Une erreur s'est produit pendant la génération du fichier d'export"
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr "Une erreur s'est produite"
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr "Exportez votre compte utilisateur"
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr "Cette action va créer une archive compressée qui contiendra les données de votre compte ownCloud."
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr "Importer un compte utilisateur"
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr "Archive Zip de l'utilisateur"
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr "Importer"
diff --git a/l10n/fr/user_openid.po b/l10n/fr/user_openid.po
new file mode 100644
index 00000000000..df7952aa7cc
--- /dev/null
+++ b/l10n/fr/user_openid.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 16:05+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr "Ce serveur est un point d'accès OpenID. Pour plus d'informations, veuillez consulter"
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr "Identité : <b>"
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr "Domaine : <b>"
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr "Utilisateur : <b>"
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr "Connexion"
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr "Erreur : <b>Aucun nom d'utilisateur n'a été saisi"
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr "vous pouvez vous authentifier sur d'autres sites grâce à cette adresse"
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr "Fournisseur d'identité OpenID autorisé"
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr "Votre adresse Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/gl/admin_dependencies_chk.po b/l10n/gl/admin_dependencies_chk.po
new file mode 100644
index 00000000000..09e5576eba1
--- /dev/null
+++ b/l10n/gl/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/gl/admin_migrate.po b/l10n/gl/admin_migrate.po
new file mode 100644
index 00000000000..7684dc62ca7
--- /dev/null
+++ b/l10n/gl/admin_migrate.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 06:27+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr "Exporta esta instancia de ownCloud"
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr "Esto creará un ficheiro comprimido que contén os datos de esta instancia de ownCloud.\nPor favor escolla o modo de exportación:"
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr "Exportar"
diff --git a/l10n/gl/calendar.po b/l10n/gl/calendar.po
index 64798f954a2..d9a060f2dc2 100644
--- a/l10n/gl/calendar.po
+++ b/l10n/gl/calendar.po
@@ -9,21 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Non se atoparon calendarios."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Non se atoparon eventos."
 
@@ -31,300 +39,394 @@ msgstr "Non se atoparon eventos."
 msgid "Wrong calendar"
 msgstr "Calendario equivocado"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Novo fuso horario:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Fuso horario trocado"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Petición non válida"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Calendario"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d MMM[ yyyy]{ '&#8212;'d [ MMM] yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d,yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Aniversario"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Traballo"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Chamada"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Clientes"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Remitente"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Vacacións"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideas"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Viaxe"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Aniversario especial"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Reunión"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Outro"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Persoal"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Proxectos"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Preguntas"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Traballo"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "sen nome"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Novo calendario"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Non se repite"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "A diario"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Todas as semanas"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Cada dúas semanas"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Mensual"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Anual"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nunca"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "por acontecementos"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "por data"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "por día do mes"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "por día da semana"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Luns"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Martes"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Mércores"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Xoves"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Venres"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sábado"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Domingo"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "semana dos eventos no mes"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "primeiro"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "segundo"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "terceiro"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "cuarto"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "quinto"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "último"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Xaneiro"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Febreiro"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Marzo"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Abril"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Maio"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Xuño"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Xullo"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Agosto"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Setembro"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Outubro"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Novembro"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Decembro"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "por data dos eventos"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "por dia(s) do ano"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "por número(s) de semana"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "por día e mes"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Data"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Cal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Todo o dia"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Novo calendario"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Faltan campos"
@@ -358,40 +460,32 @@ msgstr "O evento remata antes de iniciarse"
 msgid "There was a database fail"
 msgstr "Produciuse un erro na base de datos"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Semana"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mes"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Hoxe"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Calendarios"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Produciuse un erro ao procesar o ficheiro"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Escolla os calendarios activos"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Os seus calendarios"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Ligazón CalDav"
 
@@ -403,19 +497,19 @@ msgstr "Calendarios compartidos"
 msgid "No shared calendars"
 msgstr "Sen calendarios compartidos"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Compartir calendario"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Borrar"
@@ -501,23 +595,23 @@ msgstr "Separe as categorías con comas"
 msgid "Edit categories"
 msgstr "Editar categorías"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Eventos do día"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Desde"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "a"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Opcións avanzadas"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Localización"
 
@@ -525,7 +619,7 @@ msgstr "Localización"
 msgid "Location of the Event"
 msgstr "Localización do evento"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Descrición"
 
@@ -533,84 +627,86 @@ msgstr "Descrición"
 msgid "Description of the Event"
 msgstr "Descrición do evento"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Repetir"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Seleccionar días da semana"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Seleccionar días"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "e día dos eventos no ano."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "e día dos eventos no mes."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Seleccione meses"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Seleccionar semanas"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "e semana dos eventos no ano."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervalo"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Fin"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "acontecementos"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "crear un novo calendario"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Importar un ficheiro de calendario"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Por favor, seleccione o calendario"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "crear un novo calendario"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Nome do novo calendario"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importar"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importar calendario"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Calendario importado correctamente"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Importar"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Pechar diálogo"
 
@@ -626,45 +722,73 @@ msgstr "Ver un evento"
 msgid "No categories selected"
 msgstr "Non seleccionou as categorías"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Seleccionar categoría"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "de"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "a"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Fuso horario"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Comprobar sempre cambios de fuso horario"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Formato de hora"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Primeiro día da semana"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Enderezo de sincronización do calendario CalDAV:"
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index 4ff4ac68aa3..609d9516210 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Produciuse un erro (des)activando a axenda."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "non se estableceu o id."
 
@@ -61,7 +61,7 @@ msgstr "Non se atoparon contactos."
 msgid "There was an error adding the contact."
 msgstr "Produciuse un erro engadindo o contacto."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "non se nomeou o elemento."
 
@@ -85,11 +85,11 @@ msgstr "Tentando engadir propiedade duplicada: "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "A información sobre a vCard é incorrecta. Por favor volva cargar a páxina."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Produciuse un erro borrando a propiedade do contacto."
 
@@ -101,19 +101,19 @@ msgstr "ID perdido"
 msgid "Error parsing VCard for ID: \""
 msgstr "Erro procesando a VCard para o ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "non se estableceu a suma de verificación."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "A información sobre a vCard é incorrecta. Por favor, recargue a páxina: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Produciuse un erro actualizando a propiedade do contacto."
 
@@ -162,19 +162,19 @@ msgstr "Erro obtendo a propiedade PHOTO."
 msgid "Error saving contact."
 msgstr "Erro gardando o contacto."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Erro cambiando o tamaño da imaxe"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Erro recortando a imaxe"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Erro creando a imaxe temporal"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Erro buscando a imaxe: "
 
@@ -274,6 +274,10 @@ msgid ""
 "on this server."
 msgstr "O ficheiro que tenta subir supera o tamaño máximo permitido neste servidor."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Seleccione tipo"
@@ -532,7 +536,7 @@ msgstr "Editar detalles do nome"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -843,30 +847,30 @@ msgstr ""
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nova axenda"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Gardar"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
new file mode 100644
index 00000000000..c401e95b840
--- /dev/null
+++ b/l10n/gl/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
new file mode 100644
index 00000000000..056cc10b6a9
--- /dev/null
+++ b/l10n/gl/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
new file mode 100644
index 00000000000..ddde4141dc2
--- /dev/null
+++ b/l10n/gl/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/gl/files_versions.po b/l10n/gl/files_versions.po
new file mode 100644
index 00000000000..7c68c81752b
--- /dev/null
+++ b/l10n/gl/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 450e65227e5..f48a73f502e 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,27 @@ msgstr "Galego"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Conectar"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Máis"
 
diff --git a/l10n/gl/tasks.po b/l10n/gl/tasks.po
new file mode 100644
index 00000000000..39ebfcde7c5
--- /dev/null
+++ b/l10n/gl/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
new file mode 100644
index 00000000000..08efd8bd99f
--- /dev/null
+++ b/l10n/gl/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/gl/user_migrate.po b/l10n/gl/user_migrate.po
new file mode 100644
index 00000000000..b36741c479e
--- /dev/null
+++ b/l10n/gl/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/gl/user_openid.po b/l10n/gl/user_openid.po
new file mode 100644
index 00000000000..6566b274dfe
--- /dev/null
+++ b/l10n/gl/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/he/admin_dependencies_chk.po b/l10n/he/admin_dependencies_chk.po
new file mode 100644
index 00000000000..01c45eae4c9
--- /dev/null
+++ b/l10n/he/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/he/admin_migrate.po b/l10n/he/admin_migrate.po
new file mode 100644
index 00000000000..6968c6351ef
--- /dev/null
+++ b/l10n/he/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/he/calendar.po b/l10n/he/calendar.po
index a29ec434338..2cbab15c828 100644
--- a/l10n/he/calendar.po
+++ b/l10n/he/calendar.po
@@ -4,27 +4,36 @@
 # 
 # Translators:
 # Elad Alfassa <elad@fedoraproject.org>, 2011.
+#   <ido.parag@gmail.com>, 2012.
 #   <tomerc+transifex.net@gmail.com>, 2011.
 # Yaron Shahrabani <sh.yaron@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "לא נמצאו לוחות שנה."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "לא נמצאו אירועים."
 
@@ -32,300 +41,394 @@ msgstr "לא נמצאו אירועים."
 msgid "Wrong calendar"
 msgstr "לוח שנה לא נכון"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "אזור זמן חדש:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "אזור זמן השתנה"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "בקשה לא חוקית"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "ח שנה"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d MMM [ yyyy]{ '&#8212;'d[ MMM] yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "יום הולדת"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "עסקים"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "שיחה"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "לקוחות"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "משלוח"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "חגים"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "רעיונות"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "מסע"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "יובל"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "פגישה"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "אחר"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "אישי"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "פרוייקטים"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "שאלות"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "עבודה"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "ללא שם"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "לוח שנה חדש"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "ללא חזרה"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "יומי"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "שבועי"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "כל יום עבודה"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "דו שבועי"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "חודשי"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "שנתי"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "לעולם לא"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "לפי מופעים"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "לפי תאריך"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "לפי היום בחודש"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "לפי היום בשבוע"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "יום שני"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "יום שלישי"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "יום רביעי"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "יום חמישי"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "יום שישי"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "שבת"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "יום ראשון"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "שבוע בחודש לציון הפעילות"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "ראשון"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "שני"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "שלישי"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "רביעי"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "חמישי"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "אחרון"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "ינואר"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "פברואר"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "מרץ"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "אפריל"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "מאי"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "יוני"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "יולי"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "אוגוסט"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "ספטמבר"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "אוקטובר"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "נובמבר"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "דצמבר"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "לפי תאריכי האירועים"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "לפי ימים בשנה"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "לפי מספרי השבועות"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "לפי יום וחודש"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "תאריך"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "לוח שנה"
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "היום"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "לוח שנה חדש"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "שדות חסרים"
@@ -359,40 +462,32 @@ msgstr "האירוע מסתיים עוד לפני שהתחיל"
 msgid "There was a database fail"
 msgstr "אירע כשל במסד הנתונים"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "שבוע"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "חודש"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "רשימה"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "היום"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "לוחות שנה"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "אירעה שגיאה בעת פענוח הקובץ."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "בחר לוחות שנה פעילים"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "לוחות השנה שלך"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "קישור CalDav"
 
@@ -404,19 +499,19 @@ msgstr "לוחות שנה מושתפים"
 msgid "No shared calendars"
 msgstr "אין לוחות שנה משותפים"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "שיתוף לוח שנה"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "עריכה"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "מחיקה"
@@ -502,23 +597,23 @@ msgstr "הפרדת קטגוריות בפסיק"
 msgid "Edit categories"
 msgstr "עריכת קטגוריות"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "אירוע של כל היום"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "מאת"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "עבור"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "אפשרויות מתקדמות"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "מיקום"
 
@@ -526,7 +621,7 @@ msgstr "מיקום"
 msgid "Location of the Event"
 msgstr "מיקום האירוע"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "תיאור"
 
@@ -534,84 +629,86 @@ msgstr "תיאור"
 msgid "Description of the Event"
 msgstr "תיאור האירוע"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "חזרה"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "יש לבחור ימים בשבוע"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "יש לבחור בימים"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "ויום האירוע בשנה."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "ויום האירוע בחודש."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "יש לבחור בחודשים"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "יש לבחור בשבועות"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "ומספור השבוע הפעיל בשנה."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "משך"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "סיום"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "מופעים"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "יצירת לוח שנה חדש"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "יבוא קובץ לוח שנה"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "נא לבחור את לוח השנה"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "יצירת לוח שנה חדש"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "שם לוח השנה החדש"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "יבוא"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "היומן מייובא"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "היומן ייובא בהצלחה"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "יבוא"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "סגירת הדו־שיח"
 
@@ -627,45 +724,73 @@ msgstr "צפייה באירוע"
 msgid "No categories selected"
 msgstr "לא נבחרו קטגוריות"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "בחר קטגוריה"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "מתוך"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "בשנה"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "אזור זמן"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "יש לבדוק תמיד אם יש הבדלים באזורי הזמן"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "מבנה התאריך"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24 שעות"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12 שעות"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "היום הראשון בשבוע"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "כתובת הסנכרון ללוח שנה מסוג CalDAV:"
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index d3656f0e89c..95a5b199da3 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "שגיאה בהפעלה או בנטרול פנקס הכתובות."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "מספר מזהה לא נקבע."
 
@@ -62,7 +62,7 @@ msgstr "לא נמצאו אנשי קשר."
 msgid "There was an error adding the contact."
 msgstr "אירעה שגיאה בעת הוספת איש הקשר."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "שם האלמנט לא נקבע."
 
@@ -86,11 +86,11 @@ msgstr "ניסיון להוספת מאפיין כפול: "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "המידע אודות vCard אינו נכון. נא לטעון מחדש את הדף."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "שגיאה במחיקת מאפיין של איש הקשר."
 
@@ -102,19 +102,19 @@ msgstr "מזהה חסר"
 msgid "Error parsing VCard for ID: \""
 msgstr "שגיאה בפענוח ה VCard עבור מספר המזהה: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "סיכום ביקורת לא נקבע."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "המידע עבור ה vCard אינו נכון. אנא טען את העמוד: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "משהו לא התנהל כצפוי."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "שגיאה בעדכון המאפיין של איש הקשר."
 
@@ -163,19 +163,19 @@ msgstr "שגיאה בקבלת מידע של תמונה"
 msgid "Error saving contact."
 msgstr "שגיאה בשמירת איש הקשר"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "שגיאה בשינוי גודל התמונה"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -275,6 +275,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -533,7 +537,7 @@ msgstr "ערוך פרטי שם"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "מחיקה"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "עריכה"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "פנקס כתובות חדש"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "שמירה"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "ביטול"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
new file mode 100644
index 00000000000..ab535b9271f
--- /dev/null
+++ b/l10n/he/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
new file mode 100644
index 00000000000..ba3aa0596eb
--- /dev/null
+++ b/l10n/he/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
new file mode 100644
index 00000000000..30342046dfe
--- /dev/null
+++ b/l10n/he/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/he/files_versions.po b/l10n/he/files_versions.po
new file mode 100644
index 00000000000..824d188bfd6
--- /dev/null
+++ b/l10n/he/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 5f4a6fa7670..194fa463ab2 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -72,11 +72,27 @@ msgstr "עברית"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "יומן"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "עוד"
 
diff --git a/l10n/he/tasks.po b/l10n/he/tasks.po
new file mode 100644
index 00000000000..7f26426e1cd
--- /dev/null
+++ b/l10n/he/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
new file mode 100644
index 00000000000..4dfdbd692b4
--- /dev/null
+++ b/l10n/he/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/he/user_migrate.po b/l10n/he/user_migrate.po
new file mode 100644
index 00000000000..0a4f2c67393
--- /dev/null
+++ b/l10n/he/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/he/user_openid.po b/l10n/he/user_openid.po
new file mode 100644
index 00000000000..58c09141c7a
--- /dev/null
+++ b/l10n/he/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/hr/admin_dependencies_chk.po b/l10n/hr/admin_dependencies_chk.po
new file mode 100644
index 00000000000..5278ae63b01
--- /dev/null
+++ b/l10n/hr/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/hr/admin_migrate.po b/l10n/hr/admin_migrate.po
new file mode 100644
index 00000000000..6b445e7e51d
--- /dev/null
+++ b/l10n/hr/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/hr/calendar.po b/l10n/hr/calendar.po
index 36235245142..e848e042a00 100644
--- a/l10n/hr/calendar.po
+++ b/l10n/hr/calendar.po
@@ -10,21 +10,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Nisu pronađeni kalendari"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Događaj nije pronađen."
 
@@ -32,300 +40,394 @@ msgstr "Događaj nije pronađen."
 msgid "Wrong calendar"
 msgstr "Pogrešan kalendar"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nova vremenska zona:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Vremenska zona promijenjena"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Neispravan zahtjev"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Rođendan"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Poslovno"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Poziv"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klijenti"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Dostavljač"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Praznici"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideje"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Putovanje"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Obljetnica"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Ostalo"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Osobno"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projekti"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Pitanja"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "bezimeno"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Novi kalendar"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Ne ponavlja se"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Dnevno"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Tjedno"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Svakog radnog dana"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Dvotjedno"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Mjesečno"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Godišnje"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nikad"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "po pojavama"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "po datum"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "po dana mjeseca"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "po tjednu"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "ponedeljak"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "utorak"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "srijeda"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "četvrtak"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "petak"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "subota"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "nedelja"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "prvi"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "drugi"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "treći"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "četvrti"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "peti"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "zadnji"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "siječanj"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "veljača"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "ožujak"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "travanj"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "svibanj"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "lipanj"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "srpanj"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "kolovoz"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "rujan"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "listopad"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "studeni"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "prosinac"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "po datumu događaja"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "po godini(-nama)"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "po broju tjedna(-ana)"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "po danu i mjeseca"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "datum"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Cijeli dan"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Novi kalendar"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Nedostaju polja"
@@ -359,40 +461,32 @@ msgstr "Događaj završava prije nego počinje"
 msgid "There was a database fail"
 msgstr "Pogreška u bazi podataka"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Tjedan"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mjesec"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Danas"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendari"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Pogreška pri čitanju datoteke."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Odabir aktivnih kalendara"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Vaši kalendari"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav poveznica"
 
@@ -404,19 +498,19 @@ msgstr "Podijeljeni kalendari"
 msgid "No shared calendars"
 msgstr "Nema zajedničkih kalendara"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Podjeli kalendar"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Spremi lokalno"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Uredi"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Briši"
@@ -502,23 +596,23 @@ msgstr "Odvoji kategorije zarezima"
 msgid "Edit categories"
 msgstr "Uredi kategorije"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Cjelodnevni događaj"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Od"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Za"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Napredne mogućnosti"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Lokacija"
 
@@ -526,7 +620,7 @@ msgstr "Lokacija"
 msgid "Location of the Event"
 msgstr "Lokacija događaja"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Opis"
 
@@ -534,84 +628,86 @@ msgstr "Opis"
 msgid "Description of the Event"
 msgstr "Opis događaja"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Ponavljanje"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Napredno"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Odaberi dane u tjednu"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Odaberi dane"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Odaberi mjesece"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Odaberi tjedne"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Interval"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Kraj"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "pojave"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "stvori novi kalendar"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Uvozite datoteku kalendara"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Odaberi kalendar"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "stvori novi kalendar"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Ime novog kalendara"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Uvoz"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Uvoz kalendara"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalendar je uspješno uvezen"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Uvoz"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Zatvori dijalog"
 
@@ -627,45 +723,73 @@ msgstr "Vidjeti događaj"
 msgid "No categories selected"
 msgstr "Nema odabranih kategorija"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Odabir kategorije"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "od"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "na"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Vremenska zona"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Provjerite uvijek za promjene vremenske zone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Format vremena"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Prvi dan tjedna"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Adresa za CalDAV sinkronizaciju kalendara:"
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index d1a4d81e9b6..75ab0abdb22 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Pogreška pri (de)aktivaciji adresara."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id nije postavljen."
 
@@ -61,7 +61,7 @@ msgstr "Nema kontakata."
 msgid "There was an error adding the contact."
 msgstr "Dogodila se pogreška prilikom dodavanja kontakta."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "naziv elementa nije postavljen."
 
@@ -85,11 +85,11 @@ msgstr "Pokušali ste dodati duplo svojstvo:"
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacija o vCard je neispravna. Osvježite stranicu."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Pogreška pri brisanju svojstva kontakta."
 
@@ -101,19 +101,19 @@ msgstr "Nedostupan ID identifikator"
 msgid "Error parsing VCard for ID: \""
 msgstr "Pogreška pri raščlanjivanju VCard za ID:"
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "checksum nije postavljen."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informacije o VCard su pogrešne. Molimo, učitajte ponovno stranicu:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Nešto je otišlo... krivo..."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Pogreška pri ažuriranju svojstva kontakta."
 
@@ -162,19 +162,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -274,6 +274,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -532,7 +536,7 @@ msgstr "Uredi detalje imena"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Obriši"
 
@@ -843,30 +847,30 @@ msgstr ""
 msgid "Download"
 msgstr "Preuzimanje"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Uredi"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Novi adresar"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Spremi"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Prekini"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/hr/files_encryption.po b/l10n/hr/files_encryption.po
new file mode 100644
index 00000000000..d2734fd9fd2
--- /dev/null
+++ b/l10n/hr/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
new file mode 100644
index 00000000000..3406e426af5
--- /dev/null
+++ b/l10n/hr/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
new file mode 100644
index 00000000000..218ed39d849
--- /dev/null
+++ b/l10n/hr/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/hr/files_versions.po b/l10n/hr/files_versions.po
new file mode 100644
index 00000000000..f49ed486081
--- /dev/null
+++ b/l10n/hr/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 3f40b533f14..77abd3cbb37 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,27 @@ msgstr "__ime_jezika__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "dnevnik"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "više"
 
diff --git a/l10n/hr/tasks.po b/l10n/hr/tasks.po
new file mode 100644
index 00000000000..210a819f64c
--- /dev/null
+++ b/l10n/hr/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
new file mode 100644
index 00000000000..14dcd91c011
--- /dev/null
+++ b/l10n/hr/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/hr/user_migrate.po b/l10n/hr/user_migrate.po
new file mode 100644
index 00000000000..edbfa8b1764
--- /dev/null
+++ b/l10n/hr/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/hr/user_openid.po b/l10n/hr/user_openid.po
new file mode 100644
index 00000000000..1f9e7c5ad59
--- /dev/null
+++ b/l10n/hr/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/hu_HU/admin_dependencies_chk.po b/l10n/hu_HU/admin_dependencies_chk.po
new file mode 100644
index 00000000000..1dad50f27ac
--- /dev/null
+++ b/l10n/hu_HU/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/hu_HU/admin_migrate.po b/l10n/hu_HU/admin_migrate.po
new file mode 100644
index 00000000000..f23b87abaa3
--- /dev/null
+++ b/l10n/hu_HU/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/hu_HU/calendar.po b/l10n/hu_HU/calendar.po
index 3922bbb27ed..4e689ee90eb 100644
--- a/l10n/hu_HU/calendar.po
+++ b/l10n/hu_HU/calendar.po
@@ -9,21 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Nem található naptár"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Nem található esemény"
 
@@ -31,300 +39,394 @@ msgstr "Nem található esemény"
 msgid "Wrong calendar"
 msgstr "Hibás naptár"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Új időzóna"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Időzóna megváltozott"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Érvénytelen kérés"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Naptár"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "nnn"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "nnn H/n"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "nnnn H/n"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "HHHH éééé"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "nnnn, HHH n, éééé"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Születésap"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Üzlet"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Hívás"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Kliensek"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Szállító"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Ünnepek"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ötletek"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Utazás"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Évforduló"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Találkozó"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Egyéb"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Személyes"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projektek"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Kérdések"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Munka"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "névtelen"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Új naptár"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Nem ismétlődik"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Napi"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Heti"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Minden hétköznap"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Kéthetente"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Havi"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Évi"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "soha"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "előfordulás szerint"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "dátum szerint"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "hónap napja szerint"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "hét napja szerint"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Hétfő"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Kedd"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Szerda"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Csütörtök"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Péntek"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Szombat"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Vasárnap"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "hónap heteinek sorszáma"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "első"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "második"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "harmadik"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "negyedik"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "ötödik"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "utolsó"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Január"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Február"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Március"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Április"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Május"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Június"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Július"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Augusztus"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Szeptember"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Október"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "December"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "az esemény napja szerint"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "az év napja(i) szerint"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "a hét sorszáma szerint"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "nap és hónap szerint"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Dátum"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Naptár"
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Egész nap"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Új naptár"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Hiányzó mezők"
@@ -358,40 +460,32 @@ msgstr "Az esemény véget ér a kezdés előtt."
 msgid "There was a database fail"
 msgstr "Adatbázis hiba történt"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Hét"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Hónap"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Ma"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Naptárak"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Probléma volt a fájl elemzése közben."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Aktív naptár kiválasztása"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Naptárjaid"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDAV link"
 
@@ -403,19 +497,19 @@ msgstr "Megosztott naptárak"
 msgid "No shared calendars"
 msgstr "Nincs megosztott naptár"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Naptármegosztás"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Törlés"
@@ -501,23 +595,23 @@ msgstr "Vesszővel válaszd el a kategóriákat"
 msgid "Edit categories"
 msgstr "Kategóriák szerkesztése"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Egész napos esemény"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Ettől"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Eddig"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Haladó beállítások"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Hely"
 
@@ -525,7 +619,7 @@ msgstr "Hely"
 msgid "Location of the Event"
 msgstr "Az esemény helyszíne"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Leírás"
 
@@ -533,84 +627,86 @@ msgstr "Leírás"
 msgid "Description of the Event"
 msgstr "Az esemény leírása"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Ismétlés"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Haladó"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Hétköznapok kiválasztása"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Napok kiválasztása"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "és az éves esemény napja."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "és a havi esemény napja."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Hónapok kiválasztása"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Hetek kiválasztása"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "és az heti esemény napja."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Időköz"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Vége"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "előfordulások"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "új naptár létrehozása"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Naptár-fájl importálása"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Válassz naptárat"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "új naptár létrehozása"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Új naptár neve"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importálás"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Naptár importálása"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Naptár sikeresen importálva"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Importálás"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Párbeszédablak bezárása"
 
@@ -626,45 +722,73 @@ msgstr "Esemény megtekintése"
 msgid "No categories selected"
 msgstr "Nincs kiválasztott kategória"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Kategória kiválasztása"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ", tulaj "
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ", "
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Időzóna"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Mindig ellenőrizze az időzóna-változásokat"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Időformátum"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "A hét első napja"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Naptár CalDAV szinkronizálási cím:"
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index 4a51eb1eb91..5c441e68bec 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Címlista (de)aktiválása sikertelen"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID nincs beállítva"
 
@@ -63,7 +63,7 @@ msgstr "Nem található kontakt"
 msgid "There was an error adding the contact."
 msgstr "Hiba a kapcsolat hozzáadásakor"
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "az elem neve nincs beállítva"
 
@@ -87,11 +87,11 @@ msgstr "Kísérlet dupla tulajdonság hozzáadására: "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "A vCardról szóló információ helytelen. Töltsd újra az oldalt."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Hiba a kapcsolat-tulajdonság törlésekor"
 
@@ -103,19 +103,19 @@ msgstr "Hiányzó ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "VCard elemzése sikertelen a következő ID-hoz: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "az ellenőrzőösszeg nincs beállítva"
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Helytelen információ a vCardról. Töltse újra az oldalt: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Valami balul sült el."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Hiba a kapcsolat-tulajdonság frissítésekor"
 
@@ -164,19 +164,19 @@ msgstr "A PHOTO-tulajdonság  feldolgozása sikertelen"
 msgid "Error saving contact."
 msgstr "A kontakt mentése sikertelen"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Képméretezés sikertelen"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Képvágás sikertelen"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Ideiglenes kép létrehozása sikertelen"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "A kép nem található"
 
@@ -276,6 +276,10 @@ msgid ""
 "on this server."
 msgstr "A feltöltendő fájl mérete meghaladja a megengedett mértéket"
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Típus kiválasztása"
@@ -534,7 +538,7 @@ msgstr "Név részleteinek szerkesztése"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Törlés"
 
@@ -845,30 +849,30 @@ msgstr ""
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Új címlista"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Mentés"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
new file mode 100644
index 00000000000..6b70a6b3688
--- /dev/null
+++ b/l10n/hu_HU/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
new file mode 100644
index 00000000000..b08622b2d9b
--- /dev/null
+++ b/l10n/hu_HU/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
new file mode 100644
index 00000000000..582e43e3327
--- /dev/null
+++ b/l10n/hu_HU/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/hu_HU/files_versions.po b/l10n/hu_HU/files_versions.po
new file mode 100644
index 00000000000..c7ef6a41ba6
--- /dev/null
+++ b/l10n/hu_HU/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 390d35e4ff0..4040e9e5649 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Nem tölthető le a lista az App Store-ból"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -41,7 +41,7 @@ msgstr "Érvénytelen kérés"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Hitelesítési hiba"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -49,7 +49,7 @@ msgstr "A nyelv megváltozott"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Hiba"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -69,13 +69,29 @@ msgstr "__language_name__"
 
 #: templates/admin.php:14
 msgid "Security Warning"
+msgstr "Biztonsági figyelmeztetés"
+
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Napló"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Tovább"
 
@@ -213,7 +229,7 @@ msgstr "Egyéb"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
-msgstr ""
+msgstr "al-Admin"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/hu_HU/tasks.po b/l10n/hu_HU/tasks.po
new file mode 100644
index 00000000000..73f8d611037
--- /dev/null
+++ b/l10n/hu_HU/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
new file mode 100644
index 00000000000..87c015d08c7
--- /dev/null
+++ b/l10n/hu_HU/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/hu_HU/user_migrate.po b/l10n/hu_HU/user_migrate.po
new file mode 100644
index 00000000000..ba51abb24d9
--- /dev/null
+++ b/l10n/hu_HU/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/hu_HU/user_openid.po b/l10n/hu_HU/user_openid.po
new file mode 100644
index 00000000000..bc86ad58968
--- /dev/null
+++ b/l10n/hu_HU/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/hy/admin_dependencies_chk.po b/l10n/hy/admin_dependencies_chk.po
new file mode 100644
index 00000000000..c649d0fc44d
--- /dev/null
+++ b/l10n/hy/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/hy/admin_migrate.po b/l10n/hy/admin_migrate.po
new file mode 100644
index 00000000000..2affc03615a
--- /dev/null
+++ b/l10n/hy/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/hy/calendar.po b/l10n/hy/calendar.po
index fa2e38c97a4..2187e755864 100644
--- a/l10n/hy/calendar.po
+++ b/l10n/hy/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr ""
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr ""
 
@@ -30,298 +38,392 @@ msgstr ""
 msgid "Wrong calendar"
 msgstr ""
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr ""
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Օրացույց"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Այլ"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr ""
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr ""
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr ""
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr ""
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr ""
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr ""
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr ""
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr ""
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr ""
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr ""
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr ""
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr ""
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr ""
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr ""
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr ""
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr ""
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr ""
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr ""
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr ""
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr ""
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr ""
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr ""
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr ""
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr ""
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr ""
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr ""
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr ""
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr ""
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr ""
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr ""
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr ""
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr ""
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr ""
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr ""
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr ""
 
-#: templates/calendar.php:11
-msgid "All day"
+#: templates/calendar.php:6
+msgid "Sun."
 msgstr ""
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
+#: templates/calendar.php:11
+msgid "All day"
 msgstr ""
 
 #: templates/calendar.php:13
@@ -357,32 +459,24 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Ամիս"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Այսօր"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr ""
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
 #: templates/part.choosecalendar.php:2
@@ -390,7 +484,7 @@ msgid "Your calendars"
 msgstr ""
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr ""
 
@@ -402,19 +496,19 @@ msgstr ""
 msgid "No shared calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Բեռնել"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Ջնջել"
@@ -500,23 +594,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr ""
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr ""
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr ""
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr ""
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr ""
 
@@ -524,7 +618,7 @@ msgstr ""
 msgid "Location of the Event"
 msgstr ""
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Նկարագրություն"
 
@@ -532,84 +626,86 @@ msgstr "Նկարագրություն"
 msgid "Description of the Event"
 msgstr ""
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr ""
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr ""
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr ""
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr ""
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr ""
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr ""
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr ""
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
+#: templates/part.import.php:14
+msgid "create a new calendar"
 msgstr ""
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
+#: templates/part.import.php:17
+msgid "Import a calendar file"
 msgstr ""
 
-#: templates/part.import.php:10
-msgid "create a new calendar"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
 msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
+#: templates/part.import.php:44
+msgid "Take an available name!"
 msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
+#: templates/part.import.php:47
+msgid "Import"
 msgstr ""
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr ""
 
@@ -625,44 +721,72 @@ msgstr ""
 msgid "No categories selected"
 msgstr ""
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr ""
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
 msgstr ""
 
 #: templates/share.dropdown.php:20
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index 7a32937a5d3..582ad7d76f7 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -530,7 +534,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
@@ -841,30 +845,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/hy/files_encryption.po b/l10n/hy/files_encryption.po
new file mode 100644
index 00000000000..00b039ad399
--- /dev/null
+++ b/l10n/hy/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po
new file mode 100644
index 00000000000..964bc85d34b
--- /dev/null
+++ b/l10n/hy/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
new file mode 100644
index 00000000000..082dcd23fc5
--- /dev/null
+++ b/l10n/hy/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/hy/files_versions.po b/l10n/hy/files_versions.po
new file mode 100644
index 00000000000..756f8887dd8
--- /dev/null
+++ b/l10n/hy/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index fb9bab31e24..dcc8a876799 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -69,11 +69,27 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/hy/tasks.po b/l10n/hy/tasks.po
new file mode 100644
index 00000000000..d459a98917c
--- /dev/null
+++ b/l10n/hy/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po
new file mode 100644
index 00000000000..78202c352c0
--- /dev/null
+++ b/l10n/hy/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/hy/user_migrate.po b/l10n/hy/user_migrate.po
new file mode 100644
index 00000000000..b834f8ceeee
--- /dev/null
+++ b/l10n/hy/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/hy/user_openid.po b/l10n/hy/user_openid.po
new file mode 100644
index 00000000000..ccf243a3aa0
--- /dev/null
+++ b/l10n/hy/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/ia/admin_dependencies_chk.po b/l10n/ia/admin_dependencies_chk.po
new file mode 100644
index 00000000000..1ac2e890832
--- /dev/null
+++ b/l10n/ia/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/ia/admin_migrate.po b/l10n/ia/admin_migrate.po
new file mode 100644
index 00000000000..c767ecf34f8
--- /dev/null
+++ b/l10n/ia/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/ia/calendar.po b/l10n/ia/calendar.po
index 125085ee3a1..1f981499635 100644
--- a/l10n/ia/calendar.po
+++ b/l10n/ia/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Necun calendarios trovate."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Nulle eventos trovate."
 
@@ -30,300 +38,394 @@ msgstr "Nulle eventos trovate."
 msgid "Wrong calendar"
 msgstr ""
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nove fuso horari"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr ""
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Requesta invalide."
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Calendario"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Anniversario de nativitate"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Affaires"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Appello"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Clientes"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Dies feriate"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Incontro"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Altere"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Personal"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projectos"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Demandas"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Travalio"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "sin nomine"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Nove calendario"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Non repite"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Quotidian"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Septimanal"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Cata die"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr ""
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Mensual"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Cata anno"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nunquam"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "per data"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr ""
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Lunedi"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Martedi"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Mercuridi"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Jovedi"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Venerdi"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sabbato"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Dominica"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "prime"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "secunde"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "tertie"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr ""
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr ""
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "ultime"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "januario"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februario"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Martio"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "April"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mai"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Junio"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Julio"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Augusto"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Septembre"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Octobre"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Novembre"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Decembre"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "per data de eventos"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "per dia e mense"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Data"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr ""
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Omne die"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Nove calendario"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Campos incomplete"
@@ -357,40 +459,32 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Septimana"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mense"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Hodie"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Calendarios"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Selectionar calendarios active"
-
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Tu calendarios"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr ""
 
@@ -402,19 +496,19 @@ msgstr ""
 msgid "No shared calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Discarga"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Modificar"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Deler"
@@ -500,23 +594,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr "Modificar categorias"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr ""
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Ab"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "A"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Optiones avantiate"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Loco"
 
@@ -524,7 +618,7 @@ msgstr "Loco"
 msgid "Location of the Event"
 msgstr "Loco del evento."
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Description"
 
@@ -532,84 +626,86 @@ msgstr "Description"
 msgid "Description of the Event"
 msgstr "Description del evento"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Repeter"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avantiate"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Seliger dies del septimana"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Seliger dies"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Seliger menses"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Seliger septimanas"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervallo"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Fin"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "crear un nove calendario"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Importar un file de calendario"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Selige el calendario"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "crear un nove calendario"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Nomine del calendario"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importar"
-
-#: templates/part.import.php:20
-msgid "Importing calendar"
+#: templates/part.import.php:44
+msgid "Take an available name!"
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
 msgstr ""
 
-#: templates/part.import.php:24
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Importar"
+
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Clauder dialogo"
 
@@ -625,44 +721,72 @@ msgstr "Vide un evento"
 msgid "No categories selected"
 msgstr "Nulle categorias seligite"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Selectionar categoria"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "de"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "in"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Fuso horari"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Prime die del septimana"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
 msgstr ""
 
 #: templates/share.dropdown.php:20
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index 25dc62566fb..5a436a7a255 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -61,7 +61,7 @@ msgstr "Nulle contactos trovate."
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -85,11 +85,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -101,19 +101,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -162,19 +162,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -274,6 +274,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -532,7 +536,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Deler"
 
@@ -843,30 +847,30 @@ msgstr ""
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Modificar"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nove adressario"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Salveguardar"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Cancellar"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po
new file mode 100644
index 00000000000..8b85b14f5c1
--- /dev/null
+++ b/l10n/ia/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
new file mode 100644
index 00000000000..4cb49f32d3d
--- /dev/null
+++ b/l10n/ia/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
new file mode 100644
index 00000000000..1fe706ecf44
--- /dev/null
+++ b/l10n/ia/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/ia/files_versions.po b/l10n/ia/files_versions.po
new file mode 100644
index 00000000000..d98c59df09f
--- /dev/null
+++ b/l10n/ia/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index b744d1ffd51..62fb9fe13f9 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,27 @@ msgstr "Interlingua"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Plus"
 
diff --git a/l10n/ia/tasks.po b/l10n/ia/tasks.po
new file mode 100644
index 00000000000..be00099555c
--- /dev/null
+++ b/l10n/ia/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
new file mode 100644
index 00000000000..f5bb1888f4f
--- /dev/null
+++ b/l10n/ia/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/ia/user_migrate.po b/l10n/ia/user_migrate.po
new file mode 100644
index 00000000000..b581cb2029f
--- /dev/null
+++ b/l10n/ia/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/ia/user_openid.po b/l10n/ia/user_openid.po
new file mode 100644
index 00000000000..a3e999d4377
--- /dev/null
+++ b/l10n/ia/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/id/admin_dependencies_chk.po b/l10n/id/admin_dependencies_chk.po
new file mode 100644
index 00000000000..ae358d17af8
--- /dev/null
+++ b/l10n/id/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/id/admin_migrate.po b/l10n/id/admin_migrate.po
new file mode 100644
index 00000000000..52a6b1908b9
--- /dev/null
+++ b/l10n/id/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/id/calendar.po b/l10n/id/calendar.po
index 021c23176e5..9b2e6aaf97c 100644
--- a/l10n/id/calendar.po
+++ b/l10n/id/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr ""
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr ""
 
@@ -30,300 +38,394 @@ msgstr ""
 msgid "Wrong calendar"
 msgstr ""
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Zona waktu telah diubah"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Permintaan tidak sah"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr ""
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr ""
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Tidak akan mengulangi"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Harian"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Mingguan"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Setiap Hari Minggu"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Dwi-mingguan"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Bulanan"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Tahunan"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr ""
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr ""
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr ""
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr ""
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr ""
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr ""
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr ""
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr ""
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr ""
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr ""
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr ""
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr ""
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr ""
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr ""
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr ""
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr ""
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr ""
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr ""
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr ""
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr ""
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr ""
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr ""
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr ""
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr ""
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr ""
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr ""
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr ""
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Semua Hari"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr ""
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr ""
@@ -357,40 +459,32 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Minggu"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Bulan"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Hari ini"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalender"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Terjadi kesalahan, saat mengurai berkas."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Pilih kalender aktif"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr ""
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr ""
 
@@ -402,19 +496,19 @@ msgstr ""
 msgid "No shared calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Sunting"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr ""
@@ -500,23 +594,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Agenda di Semua Hari"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Dari"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Ke"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr ""
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Lokasi"
 
@@ -524,7 +618,7 @@ msgstr "Lokasi"
 msgid "Location of the Event"
 msgstr "Lokasi Agenda"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Deskripsi"
 
@@ -532,84 +626,86 @@ msgstr "Deskripsi"
 msgid "Description of the Event"
 msgstr "Deskripsi dari Agenda"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Ulangi"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr ""
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr ""
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr ""
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr ""
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr ""
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr ""
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
+#: templates/part.import.php:14
+msgid "create a new calendar"
 msgstr ""
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
+#: templates/part.import.php:17
+msgid "Import a calendar file"
 msgstr ""
 
-#: templates/part.import.php:10
-msgid "create a new calendar"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
 msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
+#: templates/part.import.php:44
+msgid "Take an available name!"
 msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
+#: templates/part.import.php:47
+msgid "Import"
 msgstr ""
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr ""
 
@@ -625,44 +721,72 @@ msgstr ""
 msgid "No categories selected"
 msgstr ""
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr ""
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Zonawaktu"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
 msgstr ""
 
 #: templates/share.dropdown.php:20
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index eddf5cf0af3..3e58eff041b 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -530,7 +534,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
@@ -841,30 +845,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
new file mode 100644
index 00000000000..82e011fadab
--- /dev/null
+++ b/l10n/id/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po
new file mode 100644
index 00000000000..812c0c97ee5
--- /dev/null
+++ b/l10n/id/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
new file mode 100644
index 00000000000..d960b8fa4fe
--- /dev/null
+++ b/l10n/id/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/id/files_versions.po b/l10n/id/files_versions.po
new file mode 100644
index 00000000000..2014a3f2f1b
--- /dev/null
+++ b/l10n/id/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 50b38993144..d8c65bc9f61 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,27 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Lebih"
 
diff --git a/l10n/id/tasks.po b/l10n/id/tasks.po
new file mode 100644
index 00000000000..bea6e2596fe
--- /dev/null
+++ b/l10n/id/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
new file mode 100644
index 00000000000..528094a8b2b
--- /dev/null
+++ b/l10n/id/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/id/user_migrate.po b/l10n/id/user_migrate.po
new file mode 100644
index 00000000000..8ff8940b53f
--- /dev/null
+++ b/l10n/id/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/id/user_openid.po b/l10n/id/user_openid.po
new file mode 100644
index 00000000000..426a6396684
--- /dev/null
+++ b/l10n/id/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/id_ID/admin_dependencies_chk.po b/l10n/id_ID/admin_dependencies_chk.po
new file mode 100644
index 00000000000..359c14556bb
--- /dev/null
+++ b/l10n/id_ID/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/id_ID/admin_migrate.po b/l10n/id_ID/admin_migrate.po
new file mode 100644
index 00000000000..129c39c8d73
--- /dev/null
+++ b/l10n/id_ID/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/id_ID/calendar.po b/l10n/id_ID/calendar.po
index ac6c2362a01..ebef9b9adec 100644
--- a/l10n/id_ID/calendar.po
+++ b/l10n/id_ID/calendar.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -69,31 +69,30 @@ msgstr ""
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
@@ -218,7 +217,7 @@ msgstr ""
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
@@ -242,7 +241,7 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
@@ -459,32 +458,24 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:44
-msgid "Today"
-msgstr ""
-
 #: templates/calendar.php:45
-msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
+msgid "Today"
 msgstr ""
 
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
 #: templates/part.choosecalendar.php:2
@@ -737,55 +728,63 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/id_ID/contacts.po b/l10n/id_ID/contacts.po
index d9335528e50..2fec0e37284 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -530,7 +534,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
@@ -841,30 +845,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/id_ID/files_encryption.po b/l10n/id_ID/files_encryption.po
new file mode 100644
index 00000000000..56ba9cd601f
--- /dev/null
+++ b/l10n/id_ID/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/id_ID/files_external.po b/l10n/id_ID/files_external.po
new file mode 100644
index 00000000000..1cdaed8b985
--- /dev/null
+++ b/l10n/id_ID/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/id_ID/files_sharing.po b/l10n/id_ID/files_sharing.po
new file mode 100644
index 00000000000..e98ec0d21f4
--- /dev/null
+++ b/l10n/id_ID/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/id_ID/files_versions.po b/l10n/id_ID/files_versions.po
new file mode 100644
index 00000000000..f8b53c2af4e
--- /dev/null
+++ b/l10n/id_ID/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
index c011c4ea26d..d03aaed81d4 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -69,11 +69,27 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/id_ID/tasks.po b/l10n/id_ID/tasks.po
new file mode 100644
index 00000000000..cf74571c756
--- /dev/null
+++ b/l10n/id_ID/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/id_ID/user_ldap.po b/l10n/id_ID/user_ldap.po
new file mode 100644
index 00000000000..eb078008f53
--- /dev/null
+++ b/l10n/id_ID/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/id_ID/user_migrate.po b/l10n/id_ID/user_migrate.po
new file mode 100644
index 00000000000..fd3779f871c
--- /dev/null
+++ b/l10n/id_ID/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/id_ID/user_openid.po b/l10n/id_ID/user_openid.po
new file mode 100644
index 00000000000..42b92de9fa0
--- /dev/null
+++ b/l10n/id_ID/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/it/admin_dependencies_chk.po b/l10n/it/admin_dependencies_chk.po
new file mode 100644
index 00000000000..a999a2c2bde
--- /dev/null
+++ b/l10n/it/admin_dependencies_chk.po
@@ -0,0 +1,74 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 14:54+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr "Il modulo php-json è richiesto per l'intercomunicazione di diverse applicazioni"
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr "Il modulo php-curl è richiesto per scaricare il titolo della pagina quando si aggiunge un segnalibro"
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr "Il modulo php-gd è richiesto per creare miniature delle tue immagini"
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr "Il modulo php-ldap è richiesto per collegarsi a un server ldap"
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr "Il modulo php-zip è richiesto per scaricare diversi file contemporaneamente"
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr "Il modulo php-mb_multibyte è richiesto per gestire correttamente la codifica."
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr "Il modulo php-ctype è richiesto per la validazione dei dati."
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr "Il modulo php-xml è richiesto per condividere i file con webdav."
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr "Il modulo php-pdo è richiesto per archiviare i dati di ownCloud in un database."
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr "Stato delle dipendenze"
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr "Usato da:"
diff --git a/l10n/it/admin_migrate.po b/l10n/it/admin_migrate.po
new file mode 100644
index 00000000000..df7e4841cc7
--- /dev/null
+++ b/l10n/it/admin_migrate.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 14:55+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr "Esporta questa istanza di ownClou"
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr "Questa operazione creerà un file compresso che contiene i dati dell'istanza di ownCloud. Scegli il tipo di esportazione:"
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr "Esporta"
diff --git a/l10n/it/calendar.po b/l10n/it/calendar.po
index 52db292ae4f..efdc82532d8 100644
--- a/l10n/it/calendar.po
+++ b/l10n/it/calendar.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-30 12:15+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 07:01+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -77,31 +77,30 @@ msgstr "Richiesta non valida"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Calendario"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr "ddd d/M"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr "dddd d/M"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr "dddd, d MMM yyyy"
 
@@ -226,7 +225,7 @@ msgstr "per giorno del mese"
 msgid "by weekday"
 msgstr "per giorno della settimana"
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Lunedì"
 
@@ -250,7 +249,7 @@ msgstr "Venerdì"
 msgid "Saturday"
 msgstr "Sabato"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Domenica"
 
@@ -467,33 +466,25 @@ msgstr "L'evento finisce prima d'iniziare"
 msgid "There was a database fail"
 msgstr "Si è verificato un errore del database"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Settimana"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mese"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Elenco"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Oggi"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Calendari"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Si è verificato un errore durante l'analisi del file."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Scegli i calendari attivi"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr "Impostazioni"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -745,55 +736,63 @@ msgstr "di"
 msgid "at"
 msgstr "alle"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr "Generale"
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Fuso orario"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Controlla sempre i cambiamenti di fuso orario"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr "Aggiorna automaticamente il fuso orario"
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr "Formato orario"
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Primo giorno della settimana"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr "La settimana inizia il"
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr "Cache"
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr "Cancella gli eventi che si ripetono dalla cache"
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr "URL"
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr "Indirizzi di sincronizzazione calendari CalDAV"
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr "ulteriori informazioni"
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr "Indirizzo principale (Kontact e altri)"
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr "Collegamento(i) iCalendar sola lettura"
 
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index 000b71a0bf7..b702f2eab37 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-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 06:59+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,8 +26,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Errore nel (dis)attivare la rubrica."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID non impostato."
 
@@ -63,7 +63,7 @@ msgstr "Nessun contatto trovato."
 msgid "There was an error adding the contact."
 msgstr "Si è verificato un errore nell'aggiunta del contatto."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "il nome dell'elemento non è impostato."
 
@@ -87,11 +87,11 @@ msgstr "P"
 msgid "Error adding contact property: "
 msgstr "Errore durante l'aggiunta della proprietà del contatto: "
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informazioni sulla vCard non corrette. Ricarica la pagina."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Errore durante l'eliminazione della proprietà del contatto."
 
@@ -103,19 +103,19 @@ msgstr "ID mancante"
 msgid "Error parsing VCard for ID: \""
 msgstr "Errore in fase di elaborazione del file VCard per l'ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "il codice di controllo non è impostato."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Le informazioni della vCard non sono corrette. Ricarica la pagina: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Qualcosa è andato storto. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Errore durante l'aggiornamento della proprietà del contatto."
 
@@ -164,19 +164,19 @@ msgstr "Errore di recupero della proprietà FOTO."
 msgid "Error saving contact."
 msgstr "Errore di salvataggio del contatto."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Errore di ridimensionamento dell'immagine"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Errore di ritaglio dell'immagine"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Errore durante la creazione dell'immagine temporanea"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Errore durante la ricerca dell'immagine: "
 
@@ -276,6 +276,10 @@ msgid ""
 "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:1236
+msgid "Error loading profile picture."
+msgstr "Errore durante il caricamento dell'immagine di profilo."
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Seleziona il tipo"
@@ -478,11 +482,11 @@ msgstr "Espandi/Contrai la rubrica corrente"
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Rubrica successiva"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Rubrica precedente"
 
 #: templates/index.php:54
 msgid "Actions"
@@ -534,7 +538,7 @@ msgstr "Modifica dettagli del nome"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Elimina"
 
@@ -845,30 +849,30 @@ msgstr "Mostra collegamento VCF in sola lettura"
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Modifica"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nuova rubrica"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr "Nome"
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr "Descrizione"
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Salva"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Annulla"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr "Altro..."
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
new file mode 100644
index 00000000000..573a32a14a5
--- /dev/null
+++ b/l10n/it/files_encryption.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 11:49+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr "Cifratura"
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr "Escludi i seguenti tipi di file dalla cifratura"
+
+#: templates/settings.php:5
+msgid "None"
+msgstr "Nessuna"
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr "Abilita cifratura"
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
new file mode 100644
index 00000000000..801511ce3b5
--- /dev/null
+++ b/l10n/it/files_external.po
@@ -0,0 +1,84 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Innocenzo Ventre <el.diabl09@gmail.com>, 2012.
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 14:42+0000\n"
+"Last-Translator: Innocenzo Ventre <el.diabl09@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr "Archiviazione esterna"
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr "Punto di mount"
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr "Motore"
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr "Configurazione"
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr "Opzioni"
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr "Applicabile"
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr "Aggiungi punto di mount"
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr "Nessuna impostazione"
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr "Tutti gli utenti"
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr "Gruppi"
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr "Utenti"
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr "Elimina"
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr "Certificato principale per SSL"
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr "Importa certificato principale"
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr "Abilita la memoria esterna dell'utente"
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr "Consente agli utenti di montare la propria memoria esterna"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
new file mode 100644
index 00000000000..ffb62b14fe3
--- /dev/null
+++ b/l10n/it/files_sharing.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 12:10+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr "I tuoi file condivisi"
+
+#: templates/list.php:6
+msgid "Item"
+msgstr "Elemento"
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr "Condiviso con"
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr "Permessi"
+
+#: templates/list.php:16
+msgid "Read"
+msgstr "Lettura"
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr "Modifica"
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Eliminazione"
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/it/files_versions.po b/l10n/it/files_versions.po
new file mode 100644
index 00000000000..54f176fb2e3
--- /dev/null
+++ b/l10n/it/files_versions.po
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 12:12+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr "Scadenza di tutte le versioni"
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr "Abilita controllo di versione"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 778f6a40a54..4867951b198 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-06 02:02+0200\n"
-"PO-Revision-Date: 2012-08-05 21:58+0000\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 14:56+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -76,11 +76,27 @@ msgstr "Italiano"
 msgid "Security Warning"
 msgstr "Avviso di sicurezza"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr "Cron"
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr "esegui un'attività con ogni pagina caricata"
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr "cron.php è registrato a un servizio webcron"
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr "usa il servizio cron di sistema"
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Altro"
 
@@ -146,7 +162,7 @@ msgstr "Scaricamento"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
-msgstr "La tua password è stata cambiata"
+msgstr "La tua password è stata cambiat"
 
 #: templates/personal.php:20
 msgid "Unable to change your password"
diff --git a/l10n/it/tasks.po b/l10n/it/tasks.po
new file mode 100644
index 00000000000..829120fa8a0
--- /dev/null
+++ b/l10n/it/tasks.po
@@ -0,0 +1,107 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 12:07+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr "Ora/Data non valida"
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr "Attività"
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr "Nessuna categoria"
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr "Non specificata"
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr "1=massima"
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr "5=media"
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr "9=minima"
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr "Percentuale di completamento non valida"
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr "Priorità non valida"
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr "Aggiungi attività"
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr "Caricamento attività in corso..."
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr "Importante"
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr "Elimina"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
new file mode 100644
index 00000000000..cfd6cf566ee
--- /dev/null
+++ b/l10n/it/user_ldap.po
@@ -0,0 +1,166 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Innocenzo Ventre <el.diabl09@gmail.com>, 2012.
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 14:56+0000\n"
+"Last-Translator: Innocenzo Ventre <el.diabl09@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr "Host"
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://"
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr "DN base"
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate"
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr "DN utente"
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agent,dc=example,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password"
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr "Password"
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr "Per l'accesso anonimo, lasciare vuoti i campi DN e Password"
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr "Filtro per il login utente"
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr "Specifica quale filtro utilizzare quando si tenta il login. %%uid sostituisce il nome utente all'atto del login."
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr "utilizza il segnaposto %%uid, per esempio \"uid=%%uid\""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr "Filtro per la lista utente"
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr "Specifica quale filtro utilizzare durante il recupero degli utenti."
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr "senza nessun segnaposto, per esempio \"objectClass=person\"."
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr "Filtro per il gruppo"
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr "Specifica quale filtro utilizzare durante il recupero dei gruppi."
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr "senza nessun segnaposto, per esempio \"objectClass=posixGroup\"."
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr "Porta"
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr "Struttura base dell'utente"
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr "Struttura base del gruppo"
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr "Associazione gruppo-utente "
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr "Usa TLS"
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr "Non utilizzare per le connessioni SSL, fallirà."
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr "Case insensitve LDAP server (Windows)"
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr "Disattiva il controllo del certificato SSL."
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud."
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr "Non consigliato, utilizzare solo per test."
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr "Campo per la visualizzazione del nome utente"
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr "L'attributo LDAP da usare per generare il nome dell'utente ownCloud."
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr "Campo per la visualizzazione del nome del gruppo"
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr "L'attributo LDAP da usare per generare il nome del gruppo ownCloud."
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr "in byte"
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr "in secondi. Il cambio svuota la cache."
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr "Aiuto"
diff --git a/l10n/it/user_migrate.po b/l10n/it/user_migrate.po
new file mode 100644
index 00000000000..9c918e027c5
--- /dev/null
+++ b/l10n/it/user_migrate.po
@@ -0,0 +1,52 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 11:55+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr "Esporta"
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr "Si è verificato un errore durante la creazione del file di esportazione"
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr "Si è verificato un errore"
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr "Esporta il tuo account utente"
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr "Questa operazione creerà un file compresso che contiene il tuo account ownCloud."
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr "Importa account utente"
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr "Zip account utente"
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr "Importa"
diff --git a/l10n/it/user_openid.po b/l10n/it/user_openid.po
new file mode 100644
index 00000000000..b769535161e
--- /dev/null
+++ b/l10n/it/user_openid.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 11:46+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr "Questo è un server OpenID. Per ulteriori informazioni, vedi"
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr "Identità: <b>"
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr "Dominio: <b>"
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr "Utente: <b>"
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr "Accesso"
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr "Errore: <b>nessun utente selezionato"
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr "puoi autenticarti ad altri siti con questo indirizzo"
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr "Fornitore OpenID autorizzato"
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr "Il tuo indirizzo su Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/ja_JP/admin_dependencies_chk.po b/l10n/ja_JP/admin_dependencies_chk.po
new file mode 100644
index 00000000000..1d928c91bdf
--- /dev/null
+++ b/l10n/ja_JP/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/ja_JP/admin_migrate.po b/l10n/ja_JP/admin_migrate.po
new file mode 100644
index 00000000000..b0603a4f42b
--- /dev/null
+++ b/l10n/ja_JP/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/ja_JP/calendar.po b/l10n/ja_JP/calendar.po
index 6062061a4fd..90254140d20 100644
--- a/l10n/ja_JP/calendar.po
+++ b/l10n/ja_JP/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr "すべてのカレンダーは完全にキャッシュされていません"
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr "すべて完全にキャッシュされていると思われます"
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "カレンダーが見つかりませんでした。"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "イベントが見つかりませんでした。"
 
@@ -30,300 +38,394 @@ msgstr "イベントが見つかりませんでした。"
 msgid "Wrong calendar"
 msgstr "誤ったカレンダーです"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr "イベントの無いもしくはすべてのイベントを含むファイルは既にあなたのカレンダーに保存されています。"
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr "イベントは新しいカレンダーに保存されました"
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "インポートに失敗"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "イベントはあなたのカレンダーに保存されました"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "新しいタイムゾーン:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "タイムゾーンが変更されました"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "無効なリクエストです"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "カレンダー"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "dddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "M月d日 （dddd）"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "M月d日 （dddd）"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "yyyy年M月"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
-msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr "yyyy年M月d日{ '～' [yyyy年][M月]d日}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "yyyy年M月d日 （dddd）"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "誕生日"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "ビジネス"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "電話をかける"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "顧客"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "運送会社"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "休日"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "アイデア"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "旅行"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "記念祭"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "ミーティング"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "その他"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "個人"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "プロジェクト"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "質問事項"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "週の始まり"
 
-#: lib/app.php:380
-msgid "unnamed"
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/app.php:359 lib/app.php:399
+msgid "unnamed"
+msgstr "無名"
+
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "新しくカレンダーを作成"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "繰り返さない"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "毎日"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "毎週"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "毎平日"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "2週間ごと"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "毎月"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "毎年"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "無し"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "回数で指定"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "日付で指定"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "日にちで指定"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "曜日で指定"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
-msgstr "月曜"
+msgstr "月"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
-msgstr "火曜"
+msgstr "火"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
-msgstr "水曜"
+msgstr "水"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
-msgstr "木曜"
+msgstr "木"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
-msgstr "金曜"
+msgstr "金"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
-msgstr "土曜"
+msgstr "土"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
-msgstr "日曜"
+msgstr "日"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "予定のある週を指定"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "１週目"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "２週目"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "３週目"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "４週目"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "５週目"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "最終週"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
-msgstr "１月"
+msgstr "1月"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
-msgstr "２月"
+msgstr "2月"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
-msgstr "３月"
+msgstr "3月"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
-msgstr "４月"
+msgstr "4月"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
-msgstr "５月"
+msgstr "5月"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
-msgstr "６月"
+msgstr "6月"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
-msgstr "７月"
+msgstr "7月"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
-msgstr "８月"
+msgstr "8月"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
-msgstr "９月"
+msgstr "9月"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
-msgstr "１０月"
+msgstr "10月"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
-msgstr "１１月"
+msgstr "11月"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
-msgstr "１２月"
+msgstr "12月"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "日付で指定"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "日番号で指定"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "週番号で指定"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "月と日で指定"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "日付"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "カレンダー"
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "日"
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "月"
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "火"
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "水"
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "木"
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "金"
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "土"
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "1月"
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "2月"
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "3月"
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "4月"
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "5月"
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "6月"
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "7月"
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "8月"
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "9月"
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "10月"
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "11月"
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "12月"
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "終日"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "新しくカレンダーを作成"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "項目がありません"
@@ -357,40 +459,32 @@ msgstr "イベント終了時間が開始時間より先です"
 msgid "There was a database fail"
 msgstr "データベースのエラーがありました"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "週"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "月"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "リスト"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "今日"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "カレンダー"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "ファイルの構文解析に失敗しました。"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "アクティブなカレンダーを選択"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "あなたのカレンダー"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDavへのリンク"
 
@@ -402,26 +496,26 @@ msgstr "共有カレンダー"
 msgid "No shared calendars"
 msgstr "共有カレンダーはありません"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "カレンダーを共有する"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "編集"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "削除"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "共有者"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -500,23 +594,23 @@ msgstr "カテゴリをコンマで区切る"
 msgid "Edit categories"
 msgstr "カテゴリを編集"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "終日イベント"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "開始"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "終了"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "詳細設定"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "場所"
 
@@ -524,7 +618,7 @@ msgstr "場所"
 msgid "Location of the Event"
 msgstr "イベントの場所"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "メモ"
 
@@ -532,84 +626,86 @@ msgstr "メモ"
 msgid "Description of the Event"
 msgstr "イベントの説明"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "繰り返し"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "詳細設定"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "曜日を指定"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "日付を指定"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "対象の年を選択する。"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "対象の月を選択する。"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "月を指定する"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "週を指定する"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "対象の週を選択する。"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "間隔"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "繰り返す期間"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "回繰り返す"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "新規カレンダーの作成"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "カレンダーファイルをインポート"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
 msgstr "カレンダーを選択してください"
 
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "新規カレンダーの作成"
-
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "新規カレンダーの名称"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "インポート"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr "利用可能な名前を指定してください！"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "カレンダーを取り込み中"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr "このカレンダー名はすでに使われています。もし続行する場合は、これらのカレンダーはマージされます。"
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "カレンダーの取り込みに成功しました"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "インポート"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "ダイアログを閉じる"
 
@@ -625,45 +721,73 @@ msgstr "イベントを閲覧"
 msgid "No categories selected"
 msgstr "カテゴリが選択されていません"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "カテゴリーを選択してください"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "of"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "at"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "タイムゾーン"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "タイムゾーンの変更を常に確認"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "時刻のフォーマット"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "週の始まり"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr "キャッシュ"
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr "イベントを繰り返すためにキャッシュをクリアしてください"
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr "CalDAVカレンダーの同期用アドレス"
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr "さらに"
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr "プライマリアドレス（コンタクト等）"
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "CalDAVカレンダーの同期アドレス:"
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr "読み取り専用のiCalendarリンク"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index d4930ceba7d..1643d768f3a 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr "アドレスブックの有効/無効化に失敗しました。"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "idが設定されていません。"
 
@@ -60,13 +60,13 @@ msgstr "連絡先が見つかりません。"
 msgid "There was an error adding the contact."
 msgstr "連絡先の追加でエラーが発生しました。"
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "要素名が設定されていません。"
 
 #: ajax/contact/addproperty.php:46
 msgid "Could not parse contact: "
-msgstr ""
+msgstr "連絡先を解析できませんでした:"
 
 #: ajax/contact/addproperty.php:56
 msgid "Cannot add empty property."
@@ -84,35 +84,35 @@ msgstr "重複する属性を追加: "
 msgid "Error adding contact property: "
 msgstr "コンタクト属性の追加エラー: "
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCardの情報に誤りがあります。ページをリロードして下さい。"
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "連絡先の削除に失敗しました。"
 
 #: ajax/contact/details.php:31
 msgid "Missing ID"
-msgstr ""
+msgstr "IDが見つかりません"
 
 #: ajax/contact/details.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "VCardからIDの抽出エラー: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "チェックサムが設定されていません。"
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCardの情報が正しくありません。ページを再読み込みしてください: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
-msgstr ""
+msgstr "何かがFUBARへ移動しました。"
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "連絡先の更新に失敗しました。"
 
@@ -161,19 +161,19 @@ msgstr "写真属性の取得エラー。"
 msgid "Error saving contact."
 msgstr "コンタクトの保存エラー。"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "画像のリサイズエラー"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "画像の切り抜きエラー"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "一時画像の生成エラー"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "画像検索エラー: "
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr "アップロードしようとしているファイルは、このサーバの最大ファイルアップロードサイズを超えています。"
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "タイプを選択"
@@ -297,11 +301,11 @@ msgstr " は失敗しました。"
 
 #: js/settings.js:67
 msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "表示名は空にできません。"
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "連絡先が見つかりません:"
 
 #: lib/app.php:49
 msgid "This is not your addressbook."
@@ -379,7 +383,7 @@ msgstr "ビジネス"
 
 #: lib/app.php:185
 msgid "Call"
-msgstr ""
+msgstr "電話"
 
 #: lib/app.php:186
 msgid "Clients"
@@ -471,23 +475,23 @@ msgstr "リスト内の前のコンタクト"
 
 #: templates/index.php:46
 msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "現在の連絡帳を展開する／折りたたむ"
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "次の連絡先"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "前の連絡先"
 
 #: templates/index.php:54
 msgid "Actions"
-msgstr ""
+msgstr "アクション"
 
 #: templates/index.php:57
 msgid "Refresh contacts list"
-msgstr ""
+msgstr "連絡先リストを再読込する"
 
 #: templates/index.php:59
 msgid "Add new contact"
@@ -531,7 +535,7 @@ msgstr "名前の詳細を編集"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "削除"
 
@@ -553,7 +557,7 @@ msgstr "http://www.somesite.com"
 
 #: templates/part.contact.php:44
 msgid "Go to web site"
-msgstr ""
+msgstr "Webサイトへ移動"
 
 #: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
@@ -650,19 +654,19 @@ msgstr "私書箱"
 
 #: templates/part.edit_address_dialog.php:24
 msgid "Street address"
-msgstr ""
+msgstr "住所1"
 
 #: templates/part.edit_address_dialog.php:27
 msgid "Street and number"
-msgstr ""
+msgstr "番地"
 
 #: templates/part.edit_address_dialog.php:30
 msgid "Extended"
-msgstr "番地2"
+msgstr "住所2"
 
 #: templates/part.edit_address_dialog.php:33
 msgid "Apartment number etc."
-msgstr ""
+msgstr "アパート名等"
 
 #: templates/part.edit_address_dialog.php:36
 #: templates/part.edit_address_dialog.php:39
@@ -675,7 +679,7 @@ msgstr "都道府県"
 
 #: templates/part.edit_address_dialog.php:45
 msgid "E.g. state or province"
-msgstr ""
+msgstr "例：東京都、大阪府"
 
 #: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
@@ -804,7 +808,7 @@ msgstr "アドレス帳を設定"
 
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
-msgstr ""
+msgstr "連絡先を洗濯してください"
 
 #: templates/part.selectaddressbook.php:20
 msgid "Enter name"
@@ -812,7 +816,7 @@ msgstr "名前を入力"
 
 #: templates/part.selectaddressbook.php:22
 msgid "Enter description"
-msgstr ""
+msgstr "説明を入力してください"
 
 #: templates/settings.php:3
 msgid "CardDAV syncing addresses"
@@ -832,40 +836,40 @@ msgstr "iOS/OS X"
 
 #: templates/settings.php:20
 msgid "Show CardDav link"
-msgstr ""
+msgstr "CarDavリンクを表示"
 
 #: templates/settings.php:23
 msgid "Show read-only VCF link"
-msgstr ""
+msgstr "読み取り専用のVCFリンクを表示"
 
 #: templates/settings.php:26
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "編集"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "新規電話帳"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
-msgstr ""
+msgstr "名前"
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
-msgstr ""
+msgstr "説明"
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "保存"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "取り消し"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
-msgstr ""
+msgstr "もっと..."
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
new file mode 100644
index 00000000000..5cf8f5a4c07
--- /dev/null
+++ b/l10n/ja_JP/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po
new file mode 100644
index 00000000000..6096d9408f5
--- /dev/null
+++ b/l10n/ja_JP/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
new file mode 100644
index 00000000000..fcadb4bdc9f
--- /dev/null
+++ b/l10n/ja_JP/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po
new file mode 100644
index 00000000000..e61c39bff46
--- /dev/null
+++ b/l10n/ja_JP/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 19a81081e01..79aec21152a 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "アプリストアからリストをロードできません"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -48,7 +48,7 @@ msgstr "言語が変更されました"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "エラー"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -70,11 +70,27 @@ msgstr "Japanese (日本語)"
 msgid "Security Warning"
 msgstr "セキュリティ警告"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "ログ"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "もっと"
 
@@ -212,7 +228,7 @@ msgstr "その他"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
-msgstr ""
+msgstr "サブ管理者"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/ja_JP/tasks.po b/l10n/ja_JP/tasks.po
new file mode 100644
index 00000000000..fdd063c3ca0
--- /dev/null
+++ b/l10n/ja_JP/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
new file mode 100644
index 00000000000..d19e9c5dd83
--- /dev/null
+++ b/l10n/ja_JP/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/ja_JP/user_migrate.po b/l10n/ja_JP/user_migrate.po
new file mode 100644
index 00000000000..04d95df0be9
--- /dev/null
+++ b/l10n/ja_JP/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/ja_JP/user_openid.po b/l10n/ja_JP/user_openid.po
new file mode 100644
index 00000000000..877dc59cdf1
--- /dev/null
+++ b/l10n/ja_JP/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/ko/admin_dependencies_chk.po b/l10n/ko/admin_dependencies_chk.po
new file mode 100644
index 00000000000..a6510ce3a87
--- /dev/null
+++ b/l10n/ko/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/ko/admin_migrate.po b/l10n/ko/admin_migrate.po
new file mode 100644
index 00000000000..65b1d84b619
--- /dev/null
+++ b/l10n/ko/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/ko/calendar.po b/l10n/ko/calendar.po
index f433b04414b..89b070aa858 100644
--- a/l10n/ko/calendar.po
+++ b/l10n/ko/calendar.po
@@ -9,21 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "달력이 없습니다"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "일정이 없습니다"
 
@@ -31,300 +39,394 @@ msgstr "일정이 없습니다"
 msgid "Wrong calendar"
 msgstr "잘못된 달력"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "새로운 시간대 설정"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "시간대 변경됨"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "잘못된 요청"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "달력"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
-msgstr ""
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "생일"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "사업"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "통화"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "클라이언트"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "배송"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "공휴일"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "생각"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "여행"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "기념일"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "미팅"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "기타"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "개인"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "프로젝트"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "질문"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "작업"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "익명의"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "새로운 달력"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "반복 없음"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "매일"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "매주"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "매주 특정 요일"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "2주마다"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "매월"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "매년"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "전혀"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "번 이후"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "날짜"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "월"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "주"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "월요일"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "화요일"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "수요일"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "목요일"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "금요일"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "토요일"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "일요일"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "이달의 한 주 일정"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "첫번째"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "두번째"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "세번째"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "네번째"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "다섯번째"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "마지막"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "1월"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "2월"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "3월"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "4월"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "5월"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "6월"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "7월"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "8월"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "9월"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "10월"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "11월"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "12월"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "이벤트 날짜 순"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "날짜 번호 순"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "주 번호 순"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "날짜 순"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "날짜"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "달력"
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "매일"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "새로운 달력"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "기입란이 비어있습니다"
@@ -358,40 +460,32 @@ msgstr "마침일정이 시작일정 보다 빠릅니다. "
 msgid "There was a database fail"
 msgstr "데이터베이스 에러입니다."
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "주"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "달"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "목록"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "오늘"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "달력"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "파일을 처리하는 중 오류가 발생하였습니다."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "활성 달력 선택"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "내 달력"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav 링크"
 
@@ -403,19 +497,19 @@ msgstr "공유 달력"
 msgid "No shared calendars"
 msgstr "달력 공유하지 않음"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "달력 공유"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "편집"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "삭제"
@@ -501,23 +595,23 @@ msgstr "쉼표로 카테고리 구분"
 msgid "Edit categories"
 msgstr "카테고리 수정"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "종일 이벤트"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "시작"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "끝"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "고급 설정"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "위치"
 
@@ -525,7 +619,7 @@ msgstr "위치"
 msgid "Location of the Event"
 msgstr "이벤트 위치"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "설명"
 
@@ -533,84 +627,86 @@ msgstr "설명"
 msgid "Description of the Event"
 msgstr "이벤트 설명"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "반복"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "고급"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "요일 선택"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "날짜 선택"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "그리고 이 해의 일정"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "그리고 이 달의 일정"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "달 선택"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "주 선택"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "그리고 이 해의 주간 일정"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "간격"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "끝"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "번 이후"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "새 달력 만들기"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "달력 파일 가져오기"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "달력을 선택해 주세요"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "새 달력 만들기"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "새 달력 이름"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "입력"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "달력 입력"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "달력 입력을 성공적으로 마쳤습니다."
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "입력"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "대화 마침"
 
@@ -626,45 +722,73 @@ msgstr "일정 보기"
 msgid "No categories selected"
 msgstr "선택된 카테고리 없음"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "선택 카테고리"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "의"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "에서"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "시간대"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "항상 시간대 변경 확인하기"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "시간 형식 설정"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24시간"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12시간"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "그 주의 첫째날"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "달력 CalDav 동기화 주소"
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/ko/contacts.po b/l10n/ko/contacts.po
index ceb4e271d24..5ade5e1187e 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr "주소록을 (비)활성화하는 데 실패했습니다."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "아이디가 설정되어 있지 않습니다. "
 
@@ -61,7 +61,7 @@ msgstr "연락처를 찾을 수 없습니다."
 msgid "There was an error adding the contact."
 msgstr "연락처를 추가하는 중 오류가 발생하였습니다."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "element 이름이 설정되지 않았습니다."
 
@@ -85,11 +85,11 @@ msgstr "중복 속성 추가 시도: "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard 정보가 올바르지 않습니다. 페이지를 새로 고치십시오."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "연락처 속성을 삭제할 수 없습니다."
 
@@ -101,19 +101,19 @@ msgstr "아이디 분실"
 msgid "Error parsing VCard for ID: \""
 msgstr "아이디에 대한 VCard 분석 오류"
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "체크섬이 설정되지 않았습니다."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr " vCard에 대한 정보가 잘못되었습니다. 페이지를 다시 로드하세요:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "연락처 속성을 업데이트할 수 없습니다."
 
@@ -162,19 +162,19 @@ msgstr "사진 속성을 가져오는 중 오류가 발생했습니다. "
 msgid "Error saving contact."
 msgstr "연락처 저장 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "이미지 크기 조정 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "이미지를 자르던 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "임시 이미지를 생성 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "이미지를 찾던 중 오류가 발생했습니다:"
 
@@ -274,6 +274,10 @@ msgid ""
 "on this server."
 msgstr "이 파일은 이 서버 파일 업로드 최대 용량을 초과 합니다. "
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "유형 선택"
@@ -532,7 +536,7 @@ msgstr "이름 세부사항을 편집합니다. "
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "삭제"
 
@@ -843,30 +847,30 @@ msgstr ""
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "편집"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "새 주소록"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "저장"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "취소"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
new file mode 100644
index 00000000000..4f31caefbd7
--- /dev/null
+++ b/l10n/ko/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
new file mode 100644
index 00000000000..a2ca063a69b
--- /dev/null
+++ b/l10n/ko/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
new file mode 100644
index 00000000000..ab00c1b050b
--- /dev/null
+++ b/l10n/ko/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/ko/files_versions.po b/l10n/ko/files_versions.po
new file mode 100644
index 00000000000..7646c3ad8eb
--- /dev/null
+++ b/l10n/ko/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index f14b9d6354e..ad845081a52 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,27 @@ msgstr "한국어"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "로그"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "더"
 
diff --git a/l10n/ko/tasks.po b/l10n/ko/tasks.po
new file mode 100644
index 00000000000..58c447717b4
--- /dev/null
+++ b/l10n/ko/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
new file mode 100644
index 00000000000..0cc01bfddf2
--- /dev/null
+++ b/l10n/ko/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/ko/user_migrate.po b/l10n/ko/user_migrate.po
new file mode 100644
index 00000000000..5d9886e7058
--- /dev/null
+++ b/l10n/ko/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/ko/user_openid.po b/l10n/ko/user_openid.po
new file mode 100644
index 00000000000..aaa8bf48371
--- /dev/null
+++ b/l10n/ko/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/lb/admin_dependencies_chk.po b/l10n/lb/admin_dependencies_chk.po
new file mode 100644
index 00000000000..f49abb28140
--- /dev/null
+++ b/l10n/lb/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/lb/admin_migrate.po b/l10n/lb/admin_migrate.po
new file mode 100644
index 00000000000..a4912b42c83
--- /dev/null
+++ b/l10n/lb/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/lb/calendar.po b/l10n/lb/calendar.po
index 8436a2126d2..38971117596 100644
--- a/l10n/lb/calendar.po
+++ b/l10n/lb/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Keng Kalenner fonnt."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Keng Evenementer fonnt."
 
@@ -30,300 +38,394 @@ msgstr "Keng Evenementer fonnt."
 msgid "Wrong calendar"
 msgstr "Falschen Kalenner"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nei Zäitzone:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Zäitzon geännert"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Ongülteg Requête"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalenner"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Gebuertsdag"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Geschäftlech"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Uruff"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Clienten"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Liwwerant"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Vakanzen"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideeën"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Dag"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubiläum"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Meeting"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Aner"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Perséinlech"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projeten"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Froen"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Aarbecht"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Neien Kalenner"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Widderhëlt sech net"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Deeglech"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "All Woch"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "All Wochendag"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "All zweet Woch"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "All Mount"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "All Joer"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "ni"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "no Virkommes"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "no Datum"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "no Mount-Dag"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "no Wochendag"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Méindes"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Dënschdes"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Mëttwoch"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Donneschdes"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Freides"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Samschdes"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Sonndes"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "éischt"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "Sekonn"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "Drëtt"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "Féiert"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "Fënneft"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "Läscht"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Januar"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februar"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Mäerz"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Abrëll"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mee"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Juni"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Juli"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "August"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "September"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Oktober"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Dezember"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Datum"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Cal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "All Dag"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Neien Kalenner"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Felder déi feelen"
@@ -357,40 +459,32 @@ msgstr "D'Evenement hält op ier et ufänkt"
 msgid "There was a database fail"
 msgstr "En Datebank Feeler ass opgetrueden"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Woch"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mount"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lescht"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Haut"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalenneren"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Feeler beim lueden vum Fichier."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Wiel aktiv Kalenneren aus"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Deng Kalenneren"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav Link"
 
@@ -402,19 +496,19 @@ msgstr "Gedeelte Kalenneren"
 msgid "No shared calendars"
 msgstr "Keng gedeelten Kalenneren"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Eroflueden"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Editéieren"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Läschen"
@@ -500,23 +594,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Ganz-Dag Evenement"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Vun"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Fir"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Avancéiert Optiounen"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Uert"
 
@@ -524,7 +618,7 @@ msgstr "Uert"
 msgid "Location of the Event"
 msgstr "Uert vum Evenement"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Beschreiwung"
 
@@ -532,84 +626,86 @@ msgstr "Beschreiwung"
 msgid "Description of the Event"
 msgstr "Beschreiwung vum Evenement"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Widderhuelen"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Erweidert"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Wochendeeg auswielen"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Deeg auswielen"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Méint auswielen"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Wochen auswielen"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervall"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Enn"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "Virkommes"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "E neie Kalenner uleeën"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "E Kalenner Fichier importéieren"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Wiel den Kalenner aus"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "E neie Kalenner uleeën"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Numm vum neie Kalenner"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Import"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importéiert Kalenner"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalenner erfollegräich importéiert"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Import"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Dialog zoumaachen"
 
@@ -625,45 +721,73 @@ msgstr ""
 msgid "No categories selected"
 msgstr ""
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Kategorie auswielen"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Zäitzon"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Zäit Format"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "CalDAV Kalenner Synchronisatioun's Adress:"
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index 196d17c966b..e2d248e4536 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Fehler beim (de)aktivéieren vum Adressbuch."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID ass net gesat."
 
@@ -60,7 +60,7 @@ msgstr "Keng Kontakter fonnt."
 msgid "There was an error adding the contact."
 msgstr "Fehler beim bäisetzen vun engem Kontakt."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -84,11 +84,11 @@ msgstr "Probéieren duebel Proprietéit bäi ze setzen:"
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informatioun iwwert vCard ass net richteg. Lued d'Säit wegl nei."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Fehler beim läschen vun der Kontakt Proprietéit."
 
@@ -100,19 +100,19 @@ msgstr "ID fehlt"
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Fehler beim updaten vun der Kontakt Proprietéit."
 
@@ -161,19 +161,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -531,7 +535,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Läschen"
 
@@ -842,30 +846,30 @@ msgstr ""
 msgid "Download"
 msgstr "Download"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Editéieren"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Neit Adressbuch"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Späicheren"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Ofbriechen"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/lb/files_encryption.po b/l10n/lb/files_encryption.po
new file mode 100644
index 00000000000..5446d2366b4
--- /dev/null
+++ b/l10n/lb/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
new file mode 100644
index 00000000000..0ea90478bd8
--- /dev/null
+++ b/l10n/lb/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
new file mode 100644
index 00000000000..c2f614a9343
--- /dev/null
+++ b/l10n/lb/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/lb/files_versions.po b/l10n/lb/files_versions.po
new file mode 100644
index 00000000000..1ecdf054fe4
--- /dev/null
+++ b/l10n/lb/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 1209e68515b..55306588cc7 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -70,11 +70,27 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Méi"
 
diff --git a/l10n/lb/tasks.po b/l10n/lb/tasks.po
new file mode 100644
index 00000000000..62a9a4b722b
--- /dev/null
+++ b/l10n/lb/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
new file mode 100644
index 00000000000..75252b76c95
--- /dev/null
+++ b/l10n/lb/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/lb/user_migrate.po b/l10n/lb/user_migrate.po
new file mode 100644
index 00000000000..7ecbf9a92b6
--- /dev/null
+++ b/l10n/lb/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/lb/user_openid.po b/l10n/lb/user_openid.po
new file mode 100644
index 00000000000..785483e7350
--- /dev/null
+++ b/l10n/lb/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/lt_LT/admin_dependencies_chk.po b/l10n/lt_LT/admin_dependencies_chk.po
new file mode 100644
index 00000000000..52d674cbee3
--- /dev/null
+++ b/l10n/lt_LT/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/lt_LT/admin_migrate.po b/l10n/lt_LT/admin_migrate.po
new file mode 100644
index 00000000000..d35d28001f6
--- /dev/null
+++ b/l10n/lt_LT/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/lt_LT/calendar.po b/l10n/lt_LT/calendar.po
index 33742c956ee..9d116aac12f 100644
--- a/l10n/lt_LT/calendar.po
+++ b/l10n/lt_LT/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Kalendorių nerasta."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Įvykių nerasta."
 
@@ -30,300 +38,394 @@ msgstr "Įvykių nerasta."
 msgid "Wrong calendar"
 msgstr "Ne tas kalendorius"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nauja laiko juosta:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Laiko zona pakeista"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Klaidinga užklausa"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalendorius"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Gimtadienis"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Verslas"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Skambučiai"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klientai"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Vykdytojas"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Išeiginės"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Idėjos"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Kelionė"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubiliejus"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Susitikimas"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Kiti"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Asmeniniai"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projektai"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Klausimai"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Darbas"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "be pavadinimo"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Naujas kalendorius"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Nekartoti"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Kasdien"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Kiekvieną savaitę"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Kiekvieną savaitės dieną"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Kas dvi savaites"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Kiekvieną mėnesį"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Kiekvienais metais"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "niekada"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "pagal datą"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "pagal mėnesio dieną"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "pagal savaitės dieną"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Pirmadienis"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Antradienis"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Trečiadienis"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Penktadienis"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Šeštadienis"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Sekmadienis"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr ""
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr ""
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr ""
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr ""
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr ""
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr ""
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Sausis"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Vasaris"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Kovas"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Balandis"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Gegužė"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Birželis"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Liepa"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Rugpjūtis"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Rugsėjis"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Spalis"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Lapkritis"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Gruodis"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Data"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Visa diena"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Naujas kalendorius"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Trūkstami laukai"
@@ -357,40 +459,32 @@ msgstr "Įvykis baigiasi anksčiau nei jis prasideda"
 msgid "There was a database fail"
 msgstr "Įvyko duomenų bazės klaida"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Savaitė"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mėnuo"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Sąrašas"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Šiandien"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendoriai"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Apdorojant failą įvyko klaida."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Pasirinkite naudojamus kalendorius"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Jūsų kalendoriai"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav adresas"
 
@@ -402,19 +496,19 @@ msgstr "Bendri kalendoriai"
 msgid "No shared calendars"
 msgstr "Bendrų kalendorių nėra"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Dalintis kalendoriumi"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Keisti"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Trinti"
@@ -474,7 +568,7 @@ msgstr "Pasikartojantis"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Priminimas"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
@@ -500,23 +594,23 @@ msgstr "Atskirkite kategorijas kableliais"
 msgid "Edit categories"
 msgstr "Redaguoti kategorijas"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Visos dienos įvykis"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Nuo"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Iki"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Papildomi nustatymai"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Vieta"
 
@@ -524,7 +618,7 @@ msgstr "Vieta"
 msgid "Location of the Event"
 msgstr "Įvykio vieta"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Aprašymas"
 
@@ -532,84 +626,86 @@ msgstr "Aprašymas"
 msgid "Description of the Event"
 msgstr "Įvykio aprašymas"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Kartoti"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Pasirinkite savaitės dienas"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Pasirinkite dienas"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Pasirinkite mėnesius"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Pasirinkite savaites"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervalas"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Pabaiga"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "sukurti naują kalendorių"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Importuoti kalendoriaus failą"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Pasirinkite kalendorių"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "sukurti naują kalendorių"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Naujo kalendoriaus pavadinimas"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importuoti"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importuojamas kalendorius"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalendorius sėkmingai importuotas"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Importuoti"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Uždaryti"
 
@@ -625,45 +721,73 @@ msgstr "Peržiūrėti įvykį"
 msgid "No categories selected"
 msgstr "Nepasirinktos jokios katagorijos"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Pasirinkite kategoriją"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Laiko juosta"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Visada tikrinti laiko zonos pasikeitimus"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Laiko formatas"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24val"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12val"
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "CalDAV kalendoriaus synchronizavimo adresas:"
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index d1ce7da059c..04921869c84 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Klaida (de)aktyvuojant adresų knygą."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -60,7 +60,7 @@ msgstr "Kontaktų nerasta."
 msgid "There was an error adding the contact."
 msgstr "Pridedant kontaktą įvyko klaida."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -84,11 +84,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacija apie vCard yra neteisinga. "
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -100,19 +100,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,19 +161,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -531,7 +535,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Trinti"
 
@@ -842,30 +846,30 @@ msgstr ""
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Keisti"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nauja adresų knyga"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Išsaugoti"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
new file mode 100644
index 00000000000..098eec33784
--- /dev/null
+++ b/l10n/lt_LT/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
new file mode 100644
index 00000000000..c24158d4940
--- /dev/null
+++ b/l10n/lt_LT/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
new file mode 100644
index 00000000000..f834a4d60dc
--- /dev/null
+++ b/l10n/lt_LT/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/lt_LT/files_versions.po b/l10n/lt_LT/files_versions.po
new file mode 100644
index 00000000000..32374a3c35e
--- /dev/null
+++ b/l10n/lt_LT/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index d62529df1f7..b4e462f1d03 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -70,11 +70,27 @@ msgstr "Kalba"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Žurnalas"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Daugiau"
 
diff --git a/l10n/lt_LT/tasks.po b/l10n/lt_LT/tasks.po
new file mode 100644
index 00000000000..5bbe766c2be
--- /dev/null
+++ b/l10n/lt_LT/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
new file mode 100644
index 00000000000..4002c36aa55
--- /dev/null
+++ b/l10n/lt_LT/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/lt_LT/user_migrate.po b/l10n/lt_LT/user_migrate.po
new file mode 100644
index 00000000000..391a7cbec46
--- /dev/null
+++ b/l10n/lt_LT/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/lt_LT/user_openid.po b/l10n/lt_LT/user_openid.po
new file mode 100644
index 00000000000..9567cf6ec3a
--- /dev/null
+++ b/l10n/lt_LT/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt_LT\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/lv/admin_dependencies_chk.po b/l10n/lv/admin_dependencies_chk.po
new file mode 100644
index 00000000000..0ad70f34491
--- /dev/null
+++ b/l10n/lv/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/lv/admin_migrate.po b/l10n/lv/admin_migrate.po
new file mode 100644
index 00000000000..2be34daece4
--- /dev/null
+++ b/l10n/lv/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/lv/calendar.po b/l10n/lv/calendar.po
index 48780d51cd4..f3a17a29c46 100644
--- a/l10n/lv/calendar.po
+++ b/l10n/lv/calendar.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2011-09-03 16:52+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,31 +69,30 @@ msgstr ""
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
@@ -218,7 +217,7 @@ msgstr ""
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
@@ -242,7 +241,7 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
@@ -459,32 +458,24 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:44
-msgid "Today"
-msgstr ""
-
 #: templates/calendar.php:45
-msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
+msgid "Today"
 msgstr ""
 
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
 #: templates/part.choosecalendar.php:2
@@ -737,55 +728,63 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/lv/contacts.po b/l10n/lv/contacts.po
index 0e9e46f420c..18a053d1297 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -530,7 +534,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
@@ -841,30 +845,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po
new file mode 100644
index 00000000000..6b2dc7673d7
--- /dev/null
+++ b/l10n/lv/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
new file mode 100644
index 00000000000..5004aadaab7
--- /dev/null
+++ b/l10n/lv/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
new file mode 100644
index 00000000000..940df7205eb
--- /dev/null
+++ b/l10n/lv/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/lv/files_versions.po b/l10n/lv/files_versions.po
new file mode 100644
index 00000000000..5802b0782b6
--- /dev/null
+++ b/l10n/lv/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index fffeb8f3be9..64a7220d645 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -70,11 +70,27 @@ msgstr "__valodas_nosaukums__"
 msgid "Security Warning"
 msgstr "Brīdinājums par drošību"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Vairāk"
 
diff --git a/l10n/lv/tasks.po b/l10n/lv/tasks.po
new file mode 100644
index 00000000000..20b56238ac7
--- /dev/null
+++ b/l10n/lv/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
new file mode 100644
index 00000000000..3596376f704
--- /dev/null
+++ b/l10n/lv/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/lv/user_migrate.po b/l10n/lv/user_migrate.po
new file mode 100644
index 00000000000..d54da6a081a
--- /dev/null
+++ b/l10n/lv/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/lv/user_openid.po b/l10n/lv/user_openid.po
new file mode 100644
index 00000000000..2dbaa488ad7
--- /dev/null
+++ b/l10n/lv/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/mk/admin_dependencies_chk.po b/l10n/mk/admin_dependencies_chk.po
new file mode 100644
index 00000000000..18aee717b6d
--- /dev/null
+++ b/l10n/mk/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/mk/admin_migrate.po b/l10n/mk/admin_migrate.po
new file mode 100644
index 00000000000..f692f219857
--- /dev/null
+++ b/l10n/mk/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/mk/calendar.po b/l10n/mk/calendar.po
index 547898941b7..6dfc90153f1 100644
--- a/l10n/mk/calendar.po
+++ b/l10n/mk/calendar.po
@@ -3,26 +3,35 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Miroslav Jovanovic <j.miroslav@gmail.com>, 2012.
 # Miroslav Jovanovic <jmiroslav@softhome.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Не се најдени календари."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Не се најдени настани."
 
@@ -30,300 +39,394 @@ msgstr "Не се најдени настани."
 msgid "Wrong calendar"
 msgstr "Погрешен календар"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Нова временска зона:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Временската зона е променета"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Неправилно барање"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Календар"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ддд"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "ддд М/д"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "дддд М/д"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "ММММ гггг"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "дддд, МММ д, гггг"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Роденден"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Деловно"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Повикај"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Клиенти"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Доставувач"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Празници"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Идеи"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Патување"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Јубилеј"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Состанок"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Останато"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Лично"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Проекти"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Прашања"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Работа"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "неименувано"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Нов календар"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Не се повторува"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Дневно"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Седмично"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Секој работен ден"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Дво-седмично"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Месечно"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Годишно"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "никогаш"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "по настан"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "по датум"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "по ден во месецот"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "по работен ден"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Понеделник"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Среда"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Четврток"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Петок"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Сабота"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Недела"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "седмични настани од месец"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "прв"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "втор"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "трет"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "четврт"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "пет"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "последен"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Јануари"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Февруари"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Март"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Април"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Мај"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Јуни"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Јули"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Август"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Септември"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Октомври"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Ноември"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Декември"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "по датумот на настанот"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "по вчерашните"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "по број на седмицата"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "по ден и месец"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Датум"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Кал."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Цел ден"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Нов календар"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Полиња кои недостасуваат"
@@ -357,40 +460,32 @@ msgstr "Овој настан завршува пред за почне"
 msgid "There was a database fail"
 msgstr "Имаше проблем со базата"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Седмица"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Месец"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Листа"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Денеска"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Календари"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Имаше проблем при парсирање на датотеката."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Избери активни календари"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Ваши календари"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Врска за CalDav"
 
@@ -402,19 +497,19 @@ msgstr "Споделени календари"
 msgid "No shared calendars"
 msgstr "Нема споделени календари"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Сподели календар"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Уреди"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Избриши"
@@ -500,23 +595,23 @@ msgstr "Одвоете ги категориите со запирка"
 msgid "Edit categories"
 msgstr "Уреди категории"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Целодневен настан"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Од"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "До"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Напредни опции"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Локација"
 
@@ -524,7 +619,7 @@ msgstr "Локација"
 msgid "Location of the Event"
 msgstr "Локација на настанот"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Опис"
 
@@ -532,84 +627,86 @@ msgstr "Опис"
 msgid "Description of the Event"
 msgstr "Опис на настанот"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Повтори"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Напредно"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Избери работни денови"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Избери денови"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "и настаните ден од година."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "и настаните ден од месец."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Избери месеци"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Избери седмици"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "и настаните седмица од година."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "интервал"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Крај"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "повторувања"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "создади нов календар"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Внеси календар од датотека "
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Ве молам изберете го календарот"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "создади нов календар"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Име на новиот календар"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Увези"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Увезување на календар"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Календарот беше успешно увезен"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Увези"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Затвори дијалог"
 
@@ -625,45 +722,73 @@ msgstr "Погледај настан"
 msgid "No categories selected"
 msgstr "Нема избрано категории"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Избери категорија"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "од"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "на"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Временска зона"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Секогаш провери за промени на временската зона"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Формат на времето"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24ч"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12ч"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Прв ден од седмицата"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "CalDAV календар адресата за синхронизација:"
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/mk/contacts.po b/l10n/mk/contacts.po
index 6bb1874661b..421574eb07d 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Грешка (де)активирање на адресарот."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ид не е поставено."
 
@@ -61,7 +61,7 @@ msgstr "Не се најдени контакти."
 msgid "There was an error adding the contact."
 msgstr "Имаше грешка при додавање на контактот."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "име за елементот не е поставена."
 
@@ -85,11 +85,11 @@ msgstr "Се обидовте да внесете дупликат вредно�
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Греш при бришење на вредноста за контакт."
 
@@ -101,19 +101,19 @@ msgstr "Недостасува ИД"
 msgid "Error parsing VCard for ID: \""
 msgstr "Грешка при парсирање VCard за ИД: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "сумата за проверка не е поставена."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Нешто се расипа."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Грешка при ажурирање на вредноста за контакт."
 
@@ -162,19 +162,19 @@ msgstr "Грешка при утврдувањето на карактерист
 msgid "Error saving contact."
 msgstr "Грешка при снимање на контактите."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Грешка при скалирање на фотографијата"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Грешка при сечење на фотографијата"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Грешка при креирањето на привремената фотографија"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Грешка при наоѓањето на фотографијата:"
 
@@ -274,6 +274,10 @@ msgid ""
 "on this server."
 msgstr "Датотеката која се обидувате да ја префрлите ја надминува максималната големина дефинирана за пренос на овој сервер."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Одбери тип"
@@ -532,7 +536,7 @@ msgstr "Уреди детали за име"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Избриши"
 
@@ -843,30 +847,30 @@ msgstr ""
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Уреди"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Нов адресар"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Сними"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Откажи"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
new file mode 100644
index 00000000000..7a40ba3a3b1
--- /dev/null
+++ b/l10n/mk/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
new file mode 100644
index 00000000000..25166e22cca
--- /dev/null
+++ b/l10n/mk/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
new file mode 100644
index 00000000000..161d976c65a
--- /dev/null
+++ b/l10n/mk/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/mk/files_versions.po b/l10n/mk/files_versions.po
new file mode 100644
index 00000000000..cafc33279cf
--- /dev/null
+++ b/l10n/mk/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 706ddbc2b46..384ec05fd83 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,27 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Записник"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Повеќе"
 
diff --git a/l10n/mk/tasks.po b/l10n/mk/tasks.po
new file mode 100644
index 00000000000..f06174892d7
--- /dev/null
+++ b/l10n/mk/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
new file mode 100644
index 00000000000..bcde61dcc65
--- /dev/null
+++ b/l10n/mk/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/mk/user_migrate.po b/l10n/mk/user_migrate.po
new file mode 100644
index 00000000000..06c88c2599f
--- /dev/null
+++ b/l10n/mk/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/mk/user_openid.po b/l10n/mk/user_openid.po
new file mode 100644
index 00000000000..3636c401f61
--- /dev/null
+++ b/l10n/mk/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/ms_MY/admin_dependencies_chk.po b/l10n/ms_MY/admin_dependencies_chk.po
new file mode 100644
index 00000000000..00564b0cf2a
--- /dev/null
+++ b/l10n/ms_MY/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/ms_MY/admin_migrate.po b/l10n/ms_MY/admin_migrate.po
new file mode 100644
index 00000000000..30cd1e1be64
--- /dev/null
+++ b/l10n/ms_MY/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/ms_MY/calendar.po b/l10n/ms_MY/calendar.po
index 76a0bb2ba12..b7b41176326 100644
--- a/l10n/ms_MY/calendar.po
+++ b/l10n/ms_MY/calendar.po
@@ -3,328 +3,433 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ahmed Noor Kader Mustajir Md Eusoff <sir.ade@gmail.com>, 2012.
 #   <hadri.hilmi@gmail.com>, 2011, 2012.
+# Hadri Hilmi <hadri.hilmi@gmail.com>, 2012.
 # Hafiz Ismail <mhbinet@gmail.com>, 2012.
+# Zulhilmi Rosnin <zulhilmi.rosnin@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/categories/rescan.php:28
-msgid "No calendars found."
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
 msgstr ""
 
-#: ajax/categories/rescan.php:36
-msgid "No events found."
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
 msgstr ""
 
+#: ajax/categories/rescan.php:29
+msgid "No calendars found."
+msgstr "Tiada kalendar dijumpai."
+
+#: ajax/categories/rescan.php:37
+msgid "No events found."
+msgstr "Tiada agenda dijumpai."
+
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
 msgstr "Silap kalendar"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Timezone Baru"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Zon waktu diubah"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Permintaan tidak sah"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "dd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
-msgstr ""
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Hari lahir"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Perniagaan"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Panggilan"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klien"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Penghantar"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Cuti"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Idea"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Perjalanan"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubli"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Perjumpaan"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Lain"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Peribadi"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projek"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Soalan"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Kerja"
 
-#: lib/app.php:380
-msgid "unnamed"
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/app.php:359 lib/app.php:399
+msgid "unnamed"
+msgstr "tiada nama"
+
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Kalendar baru"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Tidak berulang"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Harian"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Mingguan"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Setiap hari minggu"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Dua kali seminggu"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Bulanan"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Tahunan"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "jangan"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "dari kekerapan"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "dari tarikh"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "dari haribulan"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "dari hari minggu"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Isnin"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Selasa"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Rabu"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Khamis"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Jumaat"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sabtu"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Ahad"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "event minggu dari bulan"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "pertama"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "kedua"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "ketiga"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "keempat"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "kelima"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "akhir"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Januari"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februari"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Mac"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "April"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mei"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Jun"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Julai"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Ogos"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "September"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Oktober"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Disember"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "dari tarikh event"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "dari tahun"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "dari nombor minggu"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "dari hari dan bulan"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Tarikh"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kalendar"
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Sepanjang hari"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Kalendar baru"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Ruangan tertinggal"
@@ -358,71 +463,63 @@ msgstr "Peristiwa berakhir sebelum bermula"
 msgid "There was a database fail"
 msgstr "Terdapat kegagalan pada pengkalan data"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Minggu"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Bulan"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Senarai"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Hari ini"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendar"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Berlaku kegagalan ketika penguraian fail. "
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Pilih kalendar yang aktif"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Kalendar anda"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Pautan CalDav"
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Kalendar Kongsian"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Tiada kalendar kongsian"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
-msgstr ""
+msgstr "Kongsi Kalendar"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Edit"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Hapus"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr ""
+msgstr "dikongsi dengan kamu oleh"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -467,23 +564,23 @@ msgstr "Export"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
-msgstr ""
+msgstr "Maklumat agenda"
 
 #: templates/part.eventform.php:9 templates/part.showevent.php:4
 msgid "Repeating"
-msgstr ""
+msgstr "Pengulangan"
 
 #: templates/part.eventform.php:10 templates/part.showevent.php:5
 msgid "Alarm"
-msgstr ""
+msgstr "Penggera"
 
 #: templates/part.eventform.php:11 templates/part.showevent.php:6
 msgid "Attendees"
-msgstr ""
+msgstr "Jemputan"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Berkongsi"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -495,29 +592,29 @@ msgstr "kategori"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Asingkan kategori dengan koma"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Sunting Kategori"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Agenda di sepanjang hari "
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Dari"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "ke"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Pilihan maju"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Lokasi"
 
@@ -525,7 +622,7 @@ msgstr "Lokasi"
 msgid "Location of the Event"
 msgstr "Lokasi agenda"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Huraian"
 
@@ -533,84 +630,86 @@ msgstr "Huraian"
 msgid "Description of the Event"
 msgstr "Huraian agenda"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Ulang"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Maju"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Pilih hari minggu"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Pilih hari"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "dan hari event dalam tahun."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "dan hari event dalam bulan."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Pilih bulan"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Pilih minggu"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "dan event mingguan dalam setahun."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Tempoh"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Tamat"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "Peristiwa"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "Cipta kalendar baru"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Import fail kalendar"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Sila pilih kalendar"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "Cipta kalendar baru"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Nama kalendar baru"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Import"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Import kalendar"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalendar berjaya diimport"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Import"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Tutup dialog"
 
@@ -620,72 +719,100 @@ msgstr "Buat agenda baru"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Papar peristiwa"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
-
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Pilih kategori"
+msgstr "Tiada kategori dipilih"
 
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "dari"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
+msgstr "di"
+
+#: templates/settings.php:10
+msgid "General"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Zon waktu"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Sentiasa mengemaskini perubahan zon masa"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Kelendar CalDAV mengemaskini alamat:"
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Pengguna"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
-msgstr ""
+msgstr "Pilih pengguna"
 
 #: templates/share.dropdown.php:36 templates/share.dropdown.php:62
 msgid "Editable"
-msgstr ""
+msgstr "Boleh disunting"
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Kumpulan-kumpulan"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
-msgstr ""
+msgstr "pilih kumpulan-kumpulan"
 
 #: templates/share.dropdown.php:75
 msgid "make public"
-msgstr ""
+msgstr "jadikan tontonan awam"
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index 61909142b6a..a5435b96a5e 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.po
@@ -5,14 +5,15 @@
 # Translators:
 # Ahmed Noor Kader Mustajir Md Eusoff <sir.ade@gmail.com>, 2012.
 #   <hadri.hilmi@gmail.com>, 2012.
+# Hadri Hilmi <hadri.hilmi@gmail.com>, 2012.
 # Hafiz Ismail <mhbinet@gmail.com>, 2012.
 # Zulhilmi Rosnin <zulhilmi.rosnin@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +27,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Ralat nyahaktif buku alamat."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID tidak ditetapkan."
 
@@ -63,7 +64,7 @@ msgstr "Tiada kenalan dijumpai."
 msgid "There was an error adding the contact."
 msgstr "Terdapat masalah menambah maklumat."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "nama elemen tidak ditetapkan."
 
@@ -87,11 +88,11 @@ msgstr "Cuba untuk letak nilai duplikasi:"
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Maklumat vCard tidak tepat. Sila reload semula halaman ini."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Masalah memadam maklumat."
 
@@ -103,19 +104,19 @@ msgstr "ID Hilang"
 msgid "Error parsing VCard for ID: \""
 msgstr "Ralat VCard untuk ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "checksum tidak ditetapkan."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Maklumat tentang vCard tidak betul."
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Sesuatu tidak betul."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Masalah mengemaskini maklumat."
 
@@ -164,19 +165,19 @@ msgstr "Ralat mendapatkan maklumat gambar."
 msgid "Error saving contact."
 msgstr "Ralat menyimpan kenalan."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Ralat mengubah saiz imej"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Ralat memotong imej"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Ralat mencipta imej sementara"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Ralat mencari imej: "
 
@@ -276,6 +277,10 @@ msgid ""
 "on this server."
 msgstr "Fail yang ingin dimuatnaik melebihi saiz yang dibenarkan."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "PIlih jenis"
@@ -304,7 +309,7 @@ msgstr ""
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "Buku alamat tidak ditemui:"
 
 #: lib/app.php:49
 msgid "This is not your addressbook."
@@ -378,7 +383,7 @@ msgstr "Hari lahir"
 
 #: lib/app.php:184
 msgid "Business"
-msgstr ""
+msgstr "Perniagaan"
 
 #: lib/app.php:185
 msgid "Call"
@@ -386,7 +391,7 @@ msgstr ""
 
 #: lib/app.php:186
 msgid "Clients"
-msgstr ""
+msgstr "klien"
 
 #: lib/app.php:187
 msgid "Deliverer"
@@ -394,35 +399,35 @@ msgstr ""
 
 #: lib/app.php:188
 msgid "Holidays"
-msgstr ""
+msgstr "Hari kelepasan"
 
 #: lib/app.php:189
 msgid "Ideas"
-msgstr ""
+msgstr "Idea"
 
 #: lib/app.php:190
 msgid "Journey"
-msgstr ""
+msgstr "Perjalanan"
 
 #: lib/app.php:191
 msgid "Jubilee"
-msgstr ""
+msgstr "Jubli"
 
 #: lib/app.php:192
 msgid "Meeting"
-msgstr ""
+msgstr "Mesyuarat"
 
 #: lib/app.php:193
 msgid "Other"
-msgstr ""
+msgstr "Lain"
 
 #: lib/app.php:194
 msgid "Personal"
-msgstr ""
+msgstr "Peribadi"
 
 #: lib/app.php:195
 msgid "Projects"
-msgstr ""
+msgstr "Projek"
 
 #: lib/app.php:196
 msgid "Questions"
@@ -446,7 +451,7 @@ msgstr "Import"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Tetapan"
 
 #: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
@@ -478,11 +483,11 @@ msgstr ""
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Buku alamat seterusnya"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Buku alamat sebelumnya"
 
 #: templates/index.php:54
 msgid "Actions"
@@ -534,7 +539,7 @@ msgstr "Ubah butiran nama"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Padam"
 
@@ -807,15 +812,15 @@ msgstr "Konfigurasi buku alamat"
 
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
-msgstr ""
+msgstr "Pilih Buku Alamat"
 
 #: templates/part.selectaddressbook.php:20
 msgid "Enter name"
-msgstr ""
+msgstr "Masukkan nama"
 
 #: templates/part.selectaddressbook.php:22
 msgid "Enter description"
-msgstr ""
+msgstr "Masukkan keterangan"
 
 #: templates/settings.php:3
 msgid "CardDAV syncing addresses"
@@ -845,30 +850,30 @@ msgstr ""
 msgid "Download"
 msgstr "Muat naik"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Sunting"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Buku Alamat Baru"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
-msgstr ""
+msgstr "Nama"
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
-msgstr ""
+msgstr "Keterangan"
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Simpan"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Batal"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
-msgstr ""
+msgstr "Lagi..."
diff --git a/l10n/ms_MY/files_encryption.po b/l10n/ms_MY/files_encryption.po
new file mode 100644
index 00000000000..33de1d365d7
--- /dev/null
+++ b/l10n/ms_MY/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
new file mode 100644
index 00000000000..98ff53cf444
--- /dev/null
+++ b/l10n/ms_MY/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
new file mode 100644
index 00000000000..6de1cf4ae5b
--- /dev/null
+++ b/l10n/ms_MY/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/ms_MY/files_versions.po b/l10n/ms_MY/files_versions.po
new file mode 100644
index 00000000000..3e40393f2ae
--- /dev/null
+++ b/l10n/ms_MY/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 1cb2d9244c9..4caf358d9bf 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -73,11 +73,27 @@ msgstr "_nama_bahasa_"
 msgid "Security Warning"
 msgstr "Amaran keselamatan"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Lanjutan"
 
diff --git a/l10n/ms_MY/tasks.po b/l10n/ms_MY/tasks.po
new file mode 100644
index 00000000000..6a67235eeee
--- /dev/null
+++ b/l10n/ms_MY/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
new file mode 100644
index 00000000000..744d804e9c7
--- /dev/null
+++ b/l10n/ms_MY/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/ms_MY/user_migrate.po b/l10n/ms_MY/user_migrate.po
new file mode 100644
index 00000000000..f4e730b7c83
--- /dev/null
+++ b/l10n/ms_MY/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/ms_MY/user_openid.po b/l10n/ms_MY/user_openid.po
new file mode 100644
index 00000000000..867a3bb7370
--- /dev/null
+++ b/l10n/ms_MY/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms_MY\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/nb_NO/admin_dependencies_chk.po b/l10n/nb_NO/admin_dependencies_chk.po
new file mode 100644
index 00000000000..0a6cff69a08
--- /dev/null
+++ b/l10n/nb_NO/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/nb_NO/admin_migrate.po b/l10n/nb_NO/admin_migrate.po
new file mode 100644
index 00000000000..9d35d80bc37
--- /dev/null
+++ b/l10n/nb_NO/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/nb_NO/calendar.po b/l10n/nb_NO/calendar.po
index 09f790c740a..b001de5a262 100644
--- a/l10n/nb_NO/calendar.po
+++ b/l10n/nb_NO/calendar.po
@@ -12,21 +12,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Ingen kalendere funnet"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Ingen hendelser funnet"
 
@@ -34,300 +42,394 @@ msgstr "Ingen hendelser funnet"
 msgid "Wrong calendar"
 msgstr "Feil kalender"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Ny tidssone:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Tidssone endret"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Ugyldig forespørsel"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Bursdag"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Forretninger"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
-msgstr ""
+msgstr "Ring"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Kunder"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Ferie"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideér"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Reise"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubileum"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Møte"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Annet"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "ersonlig"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Prosjekter"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Spørsmål"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "uten navn"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Ny kalender"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Gjentas ikke"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Daglig"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Ukentlig"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Hver ukedag"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Annenhver uke"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Månedlig"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Årlig"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "aldri"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "etter hyppighet"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "etter dato"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "etter dag i måned"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "etter ukedag"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Mandag"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Fredag"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Søndag"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "begivenhetens uke denne måneden"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "første"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "andre"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "tredje"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "fjerde"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "femte"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "siste"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Januar"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februar"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Mars"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "April"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mai"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Juni"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Juli"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "August"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "September"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Oktober"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Desember"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "etter hendelsenes dato"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "etter dag i året"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "etter ukenummer/-numre"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "etter dag og måned"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Dato"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Hele dagen "
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Ny kalender"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Manglende felt"
@@ -361,40 +463,32 @@ msgstr "En hendelse kan ikke slutte før den har begynt."
 msgid "There was a database fail"
 msgstr "Det oppstod en databasefeil."
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Uke"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "ned"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "I dag"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendre"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Det oppstod en feil under åpningen av filen."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Velg en aktiv kalender"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Dine kalendere"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav-lenke"
 
@@ -406,19 +500,19 @@ msgstr "Delte kalendere"
 msgid "No shared calendars"
 msgstr "Ingen delte kalendere"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Del Kalender"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Endre"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Slett"
@@ -504,23 +598,23 @@ msgstr "Separer kategorier med komma"
 msgid "Edit categories"
 msgstr "Rediger kategorier"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Hele dagen-hendelse"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Fra"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Til"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Avanserte innstillinger"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Sted"
 
@@ -528,7 +622,7 @@ msgstr "Sted"
 msgid "Location of the Event"
 msgstr "Hendelsessted"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -536,84 +630,86 @@ msgstr "Beskrivelse"
 msgid "Description of the Event"
 msgstr "Hendelesebeskrivelse"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Gjenta"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avansert"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Velg ukedager"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Velg dager"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "og hendelsenes dag i året."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "og hendelsenes dag i måneden."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Velg måneder"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Velg uker"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "og hendelsenes uke i året."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervall"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Slutt"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "forekomster"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "Lag en ny kalender"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Importer en kalenderfil"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Vennligst velg kalenderen"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "Lag en ny kalender"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Navn på ny kalender:"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importer"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importerer kalender"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalenderen ble importert uten feil"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Importer"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Lukk dialog"
 
@@ -629,45 +725,73 @@ msgstr "Se på hendelse"
 msgid "No categories selected"
 msgstr "Ingen kategorier valgt"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Velg kategori"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Se alltid etter endringer i tidssone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Tidsformat:"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24 t"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12 t"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Ukens første dag"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Synkroniseringsadresse fo kalender CalDAV:"
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index a6d4c869021..ea159661fe3 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Et problem oppsto med å (de)aktivere adresseboken."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id er ikke satt."
 
@@ -63,7 +63,7 @@ msgstr "Ingen kontakter funnet."
 msgid "There was an error adding the contact."
 msgstr "Et problem oppsto med å legge til kontakten."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -87,11 +87,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informasjonen om vCard-filen er ikke riktig. Last inn siden på nytt."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Et problem oppsto med å fjerne kontaktfeltet."
 
@@ -103,19 +103,19 @@ msgstr "Manglende ID"
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Noe gikk fryktelig galt."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Et problem oppsto med å legge til kontaktfeltet."
 
@@ -164,19 +164,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr "Klarte ikke å lagre kontakt."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Klarte ikke å endre størrelse på bildet"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Klarte ikke å beskjære bildet"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Klarte ikke å lage et midlertidig bilde"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Kunne ikke finne bilde:"
 
@@ -276,6 +276,10 @@ msgid ""
 "on this server."
 msgstr "Filen du prøver å laste opp er for stor."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Velg type"
@@ -534,7 +538,7 @@ msgstr "Endre detaljer rundt navn"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Slett"
 
@@ -845,30 +849,30 @@ msgstr ""
 msgid "Download"
 msgstr "Hent ned"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Rediger"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Lagre"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po
new file mode 100644
index 00000000000..2a9b9beeb91
--- /dev/null
+++ b/l10n/nb_NO/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
new file mode 100644
index 00000000000..757e0be549b
--- /dev/null
+++ b/l10n/nb_NO/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
new file mode 100644
index 00000000000..fc3364ed34b
--- /dev/null
+++ b/l10n/nb_NO/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/nb_NO/files_versions.po b/l10n/nb_NO/files_versions.po
new file mode 100644
index 00000000000..2b2437b579a
--- /dev/null
+++ b/l10n/nb_NO/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 38b676eb430..51ea270fd48 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -74,11 +74,27 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Mer"
 
diff --git a/l10n/nb_NO/tasks.po b/l10n/nb_NO/tasks.po
new file mode 100644
index 00000000000..bcfe2131617
--- /dev/null
+++ b/l10n/nb_NO/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
new file mode 100644
index 00000000000..3a14ed0b28c
--- /dev/null
+++ b/l10n/nb_NO/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/nb_NO/user_migrate.po b/l10n/nb_NO/user_migrate.po
new file mode 100644
index 00000000000..2e2605cb75e
--- /dev/null
+++ b/l10n/nb_NO/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/nb_NO/user_openid.po b/l10n/nb_NO/user_openid.po
new file mode 100644
index 00000000000..cf98d889a49
--- /dev/null
+++ b/l10n/nb_NO/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/nl/admin_dependencies_chk.po b/l10n/nl/admin_dependencies_chk.po
new file mode 100644
index 00000000000..436ece1cdef
--- /dev/null
+++ b/l10n/nl/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/nl/admin_migrate.po b/l10n/nl/admin_migrate.po
new file mode 100644
index 00000000000..ad085a1d153
--- /dev/null
+++ b/l10n/nl/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/nl/calendar.po b/l10n/nl/calendar.po
index 1d7f622b145..8ef2a74f325 100644
--- a/l10n/nl/calendar.po
+++ b/l10n/nl/calendar.po
@@ -6,27 +6,36 @@
 #   <bart.formosus@gmail.com>, 2011.
 #   <bartv@thisnet.nl>, 2011.
 # Erik Bent <hj.bent.60@gmail.com>, 2012.
+#   <georg.stefan.germany@googlemail.com>, 2012.
 #   <jos@gelauff.net>, 2012.
 #   <pietje8501@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Geen kalenders gevonden."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Geen gebeurtenissen gevonden."
 
@@ -34,300 +43,394 @@ msgstr "Geen gebeurtenissen gevonden."
 msgid "Wrong calendar"
 msgstr "Verkeerde kalender"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nieuwe tijdszone:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Tijdzone is veranderd"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Ongeldige aanvraag"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd d.M"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd d.M"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
-msgstr "d MMM[ yyyy]{ '&#8212;' d[ MMM] yyyy}"
+msgstr "d[ MMM][ yyyy]{ '&#8212;' d MMM yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, d. MMM yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Verjaardag"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Zakelijk"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Bellen"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klanten"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Leverancier"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Vakantie"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideeën"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Reis"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubileum"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Vergadering"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Ander"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Persoonlijk"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projecten"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Vragen"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Werk"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "onbekend"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Nieuwe Kalender"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Wordt niet herhaald"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Dagelijks"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Wekelijks"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Elke weekdag"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Tweewekelijks"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Maandelijks"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Jaarlijks"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nooit meer"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "volgens gebeurtenissen"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "op datum"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "per dag van de maand"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "op weekdag"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Maandag"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Woensdag"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Donderdag"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Zondag"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "gebeurtenissen week van maand"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "eerste"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "tweede"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "derde"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "vierde"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "vijfde"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "laatste"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Januari"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februari"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Maart"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "April"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mei"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Juni"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Juli"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Augustus"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "September"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Oktober"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "December"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "volgens evenementsdatum"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "volgens jaardag(en)"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "volgens weeknummer(s)"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "per dag en maand"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Datum"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Cal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Hele dag"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Nieuwe Kalender"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "missende velden"
@@ -361,40 +464,32 @@ msgstr "Het evenement eindigt voordat het begint"
 msgid "There was a database fail"
 msgstr "Er was een databasefout"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Week"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Maand"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lijst"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Vandaag"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalenders"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Er is een fout opgetreden bij het verwerken van het bestand."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Kies actieve kalenders"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Je kalenders"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav Link"
 
@@ -406,19 +501,19 @@ msgstr "Gedeelde kalenders"
 msgid "No shared calendars"
 msgstr "Geen gedeelde kalenders"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Deel kalender"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Download"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Bewerken"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Verwijderen"
@@ -504,23 +599,23 @@ msgstr "Gescheiden door komma's"
 msgid "Edit categories"
 msgstr "Wijzig categorieën"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Hele dag"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Van"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Aan"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Geavanceerde opties"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Locatie"
 
@@ -528,7 +623,7 @@ msgstr "Locatie"
 msgid "Location of the Event"
 msgstr "Locatie van de afspraak"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Beschrijving"
 
@@ -536,84 +631,86 @@ msgstr "Beschrijving"
 msgid "Description of the Event"
 msgstr "Beschrijving van het evenement"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Herhalen"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Selecteer weekdagen"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Selecteer dagen"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "en de gebeurtenissen dag van het jaar"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "en de gebeurtenissen dag van de maand"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Selecteer maanden"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Selecteer weken"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "en de gebeurtenissen week van het jaar"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Interval"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Einde"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "gebeurtenissen"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "Maak een nieuw agenda"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Importeer een agenda bestand"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Kies de kalender"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "Maak een nieuw agenda"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Naam van de nieuwe agenda"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importeer"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importeer agenda"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Agenda succesvol geïmporteerd"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Importeer"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Sluit venster"
 
@@ -629,45 +726,73 @@ msgstr "Bekijk een gebeurtenis"
 msgid "No categories selected"
 msgstr "Geen categorieën geselecteerd"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Kies een categorie"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "van"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "op"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Tijdzone"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Controleer altijd op aanpassingen van de tijdszone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Tijdformaat"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24uur"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12uur"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Eerste dag van de week"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "CalDAV kalender synchronisatie adres:"
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index 16781f12dcb..695acef5f6a 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Fout bij het (de)activeren van het adresboek."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id is niet ingesteld."
 
@@ -64,7 +64,7 @@ msgstr "Geen contracten gevonden"
 msgid "There was an error adding the contact."
 msgstr "Er was een fout bij het toevoegen van het contact."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "onderdeel naam is niet opgegeven."
 
@@ -88,11 +88,11 @@ msgstr "Eigenschap bestaat al: "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informatie over de vCard is onjuist. Herlaad de pagina."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Fout bij het verwijderen van de contacteigenschap."
 
@@ -104,19 +104,19 @@ msgstr "Ontbrekend ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Fout bij inlezen VCard voor ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "controlegetal is niet opgegeven."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informatie over vCard is fout. Herlaad de pagina: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Er ging iets totaal verkeerd. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Fout bij het updaten van de contacteigenschap."
 
@@ -165,19 +165,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -277,6 +277,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -535,7 +539,7 @@ msgstr "Wijzig naam gegevens"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -846,30 +850,30 @@ msgstr ""
 msgid "Download"
 msgstr "Download"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Bewerken"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nieuw Adresboek"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Opslaan"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Anuleren"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
new file mode 100644
index 00000000000..bae30cdd153
--- /dev/null
+++ b/l10n/nl/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
new file mode 100644
index 00000000000..c9d33125417
--- /dev/null
+++ b/l10n/nl/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
new file mode 100644
index 00000000000..9a3b58a5545
--- /dev/null
+++ b/l10n/nl/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/nl/files_versions.po b/l10n/nl/files_versions.po
new file mode 100644
index 00000000000..94bdd0d707a
--- /dev/null
+++ b/l10n/nl/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 607ec7418f3..b056a1747bb 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -75,11 +75,27 @@ msgstr "Nederlands"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Meer"
 
diff --git a/l10n/nl/tasks.po b/l10n/nl/tasks.po
new file mode 100644
index 00000000000..f413e75158d
--- /dev/null
+++ b/l10n/nl/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
new file mode 100644
index 00000000000..89b469b7ed9
--- /dev/null
+++ b/l10n/nl/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/nl/user_migrate.po b/l10n/nl/user_migrate.po
new file mode 100644
index 00000000000..cf6e2f0cd31
--- /dev/null
+++ b/l10n/nl/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/nl/user_openid.po b/l10n/nl/user_openid.po
new file mode 100644
index 00000000000..c046633481f
--- /dev/null
+++ b/l10n/nl/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/nn_NO/admin_dependencies_chk.po b/l10n/nn_NO/admin_dependencies_chk.po
new file mode 100644
index 00000000000..e15c7820ec8
--- /dev/null
+++ b/l10n/nn_NO/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/nn_NO/admin_migrate.po b/l10n/nn_NO/admin_migrate.po
new file mode 100644
index 00000000000..55090003437
--- /dev/null
+++ b/l10n/nn_NO/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/nn_NO/calendar.po b/l10n/nn_NO/calendar.po
index 420f41350ef..97f56855aec 100644
--- a/l10n/nn_NO/calendar.po
+++ b/l10n/nn_NO/calendar.po
@@ -9,21 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr ""
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr ""
 
@@ -31,300 +39,394 @@ msgstr ""
 msgid "Wrong calendar"
 msgstr "Feil kalender"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Ny tidssone:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Endra tidssone"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Ugyldig førespurnad"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Bursdag"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Forretning"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Telefonsamtale"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klientar"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Forsending"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Høgtid"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Idear"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Reise"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubileum"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Møte"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Anna"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Personleg"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Prosjekt"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Spørsmål"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Ny kalender"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Ikkje gjenta"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Kvar dag"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Kvar veke"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Kvar vekedag"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Annakvar veke"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Kvar månad"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Kvart år"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "aldri"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "av førekomstar"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "av dato"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "av månadsdag"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "av vekedag"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Måndag"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Tysdag"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Fredag"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Laurdag"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Søndag"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "hendingas veke av månad"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "første"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "andre"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "tredje"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "fjerde"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "femte"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "siste"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Januar"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februar"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Mars"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "April"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mai"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Juni"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Juli"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "August"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "September"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Oktober"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Desember"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "av hendingsdato"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "av årsdag(ar)"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "av vekenummer"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "av dag og månad"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Dato"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Heile dagen"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Ny kalender"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Manglande felt"
@@ -358,40 +460,32 @@ msgstr "Hendinga endar før den startar"
 msgid "There was a database fail"
 msgstr "Det oppstod ein databasefeil"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Veke"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Månad"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "I dag"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendarar"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Feil ved tolking av fila."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Vel aktive kalendarar"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr ""
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav-lenkje"
 
@@ -403,19 +497,19 @@ msgstr ""
 msgid "No shared calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Endra"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Slett"
@@ -501,23 +595,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Heildagshending"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Frå"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Til"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Avanserte alternativ"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Stad"
 
@@ -525,7 +619,7 @@ msgstr "Stad"
 msgid "Location of the Event"
 msgstr "Stad for hendinga"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Skildring"
 
@@ -533,84 +627,86 @@ msgstr "Skildring"
 msgid "Description of the Event"
 msgstr "Skildring av hendinga"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Gjenta"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avansert"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Vel vekedagar"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Vel dagar"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "og hendingane dag for år."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "og hendingane dag for månad."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Vel månedar"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Vel veker"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "og hendingane veke av året."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervall"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Ende"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "førekomstar"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "Lag ny kalender"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Importer ei kalenderfil"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Venlegast vel kalenderen"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "Lag ny kalender"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Namn for ny kalender"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importer"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importerar kalender"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalender importert utan feil"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Importer"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Steng dialog"
 
@@ -626,45 +722,73 @@ msgstr ""
 msgid "No categories selected"
 msgstr ""
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Vel kategori"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Sjekk alltid for endringar i tidssona"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Tidsformat"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24t"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12t"
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Kalender CalDAV synkroniseringsadresse:"
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index 338507320b3..e9742c79bc7 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Ein feil oppstod ved (de)aktivering av adressebok."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -61,7 +61,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr "Det kom ei feilmelding då kontakta vart lagt til."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -85,11 +85,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Eit problem oppstod ved å slette kontaktfeltet."
 
@@ -101,19 +101,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Eit problem oppstod ved å endre kontaktfeltet."
 
@@ -162,19 +162,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -274,6 +274,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -532,7 +536,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Slett"
 
@@ -843,30 +847,30 @@ msgstr ""
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Endra"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Lagre"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Kanseller"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
new file mode 100644
index 00000000000..8ad39e5cbfb
--- /dev/null
+++ b/l10n/nn_NO/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
new file mode 100644
index 00000000000..c89d2fd6309
--- /dev/null
+++ b/l10n/nn_NO/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
new file mode 100644
index 00000000000..a2531fd6785
--- /dev/null
+++ b/l10n/nn_NO/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/nn_NO/files_versions.po b/l10n/nn_NO/files_versions.po
new file mode 100644
index 00000000000..3ae26d5f131
--- /dev/null
+++ b/l10n/nn_NO/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 35e4b7daace..e9d4c7ed3e5 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,27 @@ msgstr "Nynorsk"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/nn_NO/tasks.po b/l10n/nn_NO/tasks.po
new file mode 100644
index 00000000000..9ebb58b030c
--- /dev/null
+++ b/l10n/nn_NO/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
new file mode 100644
index 00000000000..86099dc6064
--- /dev/null
+++ b/l10n/nn_NO/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/nn_NO/user_migrate.po b/l10n/nn_NO/user_migrate.po
new file mode 100644
index 00000000000..40d6c0dac7a
--- /dev/null
+++ b/l10n/nn_NO/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/nn_NO/user_openid.po b/l10n/nn_NO/user_openid.po
new file mode 100644
index 00000000000..eb58b25dcb4
--- /dev/null
+++ b/l10n/nn_NO/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/pl/admin_dependencies_chk.po b/l10n/pl/admin_dependencies_chk.po
new file mode 100644
index 00000000000..bdec6321555
--- /dev/null
+++ b/l10n/pl/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/pl/admin_migrate.po b/l10n/pl/admin_migrate.po
new file mode 100644
index 00000000000..096d746c63f
--- /dev/null
+++ b/l10n/pl/admin_migrate.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Cyryl Sochacki <>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 12:31+0000\n"
+"Last-Translator: Cyryl Sochacki <>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr "Eksportuj instancję ownCloud"
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr "Spowoduje to utworzenie pliku skompresowanego, który zawiera dane tej instancji ownCloud.⏎ proszę wybrać typ eksportu:"
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr "Eksport"
diff --git a/l10n/pl/calendar.po b/l10n/pl/calendar.po
index 1a335acb352..8039d555b58 100644
--- a/l10n/pl/calendar.po
+++ b/l10n/pl/calendar.po
@@ -3,27 +3,36 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyryl Sochacki <>, 2012.
 # Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
 # Piotr Sokół <psokol@jabster.pl>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Brak kalendarzy"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Brak wydzarzeń"
 
@@ -31,300 +40,394 @@ msgstr "Brak wydzarzeń"
 msgid "Wrong calendar"
 msgstr "Nieprawidłowy kalendarz"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "Import nieudany"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "zdarzenie zostało zapisane w twoim kalendarzu"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nowa strefa czasowa:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Zmieniono strefę czasową"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Nieprawidłowe żądanie"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalendarz"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM rrrr"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, rrrr"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Urodziny"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Interesy"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Rozmowy"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klienci"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Dostawcy"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Święta"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Pomysły"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Podróże"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubileusze"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Spotkania"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Inne"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Osobiste"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projekty"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Pytania"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Zawodowe"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr "przez"
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "nienazwany"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Nowy kalendarz"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Brak"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Codziennie"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Tygodniowo"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Każdego dnia tygodnia"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Dwa razy w tygodniu"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Miesięcznie"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Rocznie"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nigdy"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "przez wydarzenia"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "po dacie"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "miesięcznie"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "tygodniowo"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Środa"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Piątek"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sobota"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "wydarzenia miesiąca"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "pierwszy"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "drugi"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "trzeci"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "czwarty"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "piąty"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "ostatni"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Styczeń"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Luty"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Marzec"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Kwiecień"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Maj"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Czerwiec"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Lipiec"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Sierpień"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Wrzesień"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Październik"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Listopad"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Grudzień"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "po datach wydarzeń"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "po dniach roku"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "po tygodniach"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "przez dzień i miesiąc"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Data"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "N."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "Pn."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "Wt."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "Śr."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "Cz."
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "Pt."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "S."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "Sty."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "Lut."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "Mar."
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "Kwi."
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "Maj."
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "Cze."
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "Lip."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "Sie."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "Wrz."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "Paź."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "Lis."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "Gru."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Cały dzień"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Nowy kalendarz"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Brakujące pola"
@@ -358,40 +461,32 @@ msgstr "Wydarzenie kończy się przed rozpoczęciem"
 msgid "There was a database fail"
 msgstr "Awaria bazy danych"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Tydzień"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Miesiąc"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Dzisiaj"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendarze"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Nie udało się przetworzyć pliku."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Wybór aktywnych kalendarzy"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Twoje kalendarze"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Wyświetla odnośnik CalDAV"
 
@@ -403,19 +498,19 @@ msgstr "Współdzielone kalendarze"
 msgid "No shared calendars"
 msgstr "Brak współdzielonych kalendarzy"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Współdziel kalendarz"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Pobiera kalendarz"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Edytuje kalendarz"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Usuwa kalendarz"
@@ -501,23 +596,23 @@ msgstr "Oddziel kategorie przecinkami"
 msgid "Edit categories"
 msgstr "Edytuj kategorie"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Wydarzenie całodniowe"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Od"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Do"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Opcje zaawansowane"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Lokalizacja"
 
@@ -525,7 +620,7 @@ msgstr "Lokalizacja"
 msgid "Location of the Event"
 msgstr "Lokalizacja wydarzenia"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Opis"
 
@@ -533,84 +628,86 @@ msgstr "Opis"
 msgid "Description of the Event"
 msgstr "Opis wydarzenia"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Powtarzanie"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Wybierz dni powszechne"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Wybierz dni"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "oraz wydarzenia roku"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "oraz wydarzenia miesiąca"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Wybierz miesiące"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Wybierz tygodnie"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "oraz wydarzenia roku."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Interwał"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Koniec"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "wystąpienia"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "stwórz nowy kalendarz"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Zaimportuj plik kalendarza"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Proszę wybrać kalendarz"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "stwórz nowy kalendarz"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "Proszę wybierz kalendarz"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Nazwa kalendarza"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Import"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importuje kalendarz"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Zaimportowano kalendarz"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Import"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Zamknij okno"
 
@@ -626,45 +723,73 @@ msgstr "Zobacz wydarzenie"
 msgid "No categories selected"
 msgstr "nie zaznaczono kategorii"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Wybierz kategorię"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "z"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "w"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Strefa czasowa"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Zawsze sprawdzaj zmiany strefy czasowej"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Format czasu"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Pierwszy dzień tygodnia"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr "więcej informacji"
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Adres synchronizacji kalendarza CalDAV:"
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr "Odczytać tylko linki iCalendar"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index 52aca242e76..04c9ce97a2e 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Błąd (de)aktywowania książki adresowej."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id nie ustawione."
 
@@ -63,7 +63,7 @@ msgstr "Nie znaleziono kontaktów."
 msgid "There was an error adding the contact."
 msgstr "Wystąpił błąd podczas dodawania kontaktu."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "nazwa elementu nie jest ustawiona."
 
@@ -87,11 +87,11 @@ msgstr "Próba dodania z duplikowanej właściwości:"
 msgid "Error adding contact property: "
 msgstr "Błąd przy dodawaniu właściwości kontaktu:"
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Błąd usuwania elementu."
 
@@ -103,19 +103,19 @@ msgstr "Brak ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Wystąpił błąd podczas przetwarzania VCard ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "checksum-a nie ustawiona"
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Gdyby coś poszło FUBAR."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Błąd uaktualniania elementu."
 
@@ -164,19 +164,19 @@ msgstr "Błąd uzyskiwania właściwości ZDJĘCIA."
 msgid "Error saving contact."
 msgstr "Błąd zapisu kontaktu."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Błąd zmiany rozmiaru obrazu"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Błąd przycinania obrazu"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Błąd utworzenia obrazu tymczasowego"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Błąd znajdowanie obrazu: "
 
@@ -276,6 +276,10 @@ msgid ""
 "on this server."
 msgstr "Plik, który próbujesz wysłać przekracza maksymalny rozmiar pliku przekazywania na tym serwerze."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Wybierz typ"
@@ -534,7 +538,7 @@ msgstr "Edytuj szczegóły nazwy"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Usuwa książkę adresową"
 
@@ -845,30 +849,30 @@ msgstr ""
 msgid "Download"
 msgstr "Pobiera książkę adresową"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Edytuje książkę adresową"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nowa książka adresowa"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Zapisz"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
new file mode 100644
index 00000000000..fbb12dbe1fb
--- /dev/null
+++ b/l10n/pl/files_encryption.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Cyryl Sochacki <>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 12:15+0000\n"
+"Last-Translator: Cyryl Sochacki <>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr "Szyfrowanie"
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr "Wyłącz następujące typy plików z szyfrowania"
+
+#: templates/settings.php:5
+msgid "None"
+msgstr "Brak"
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr "Włącz szyfrowanie"
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
new file mode 100644
index 00000000000..f86f0148ff7
--- /dev/null
+++ b/l10n/pl/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
new file mode 100644
index 00000000000..6816ef762ed
--- /dev/null
+++ b/l10n/pl/files_sharing.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Cyryl Sochacki <>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 12:29+0000\n"
+"Last-Translator: Cyryl Sochacki <>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr "Twoje udostępnione pliki"
+
+#: templates/list.php:6
+msgid "Item"
+msgstr "Element"
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr "Udostępnione dla"
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr "Uprawnienia"
+
+#: templates/list.php:16
+msgid "Read"
+msgstr "Odczyt"
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr "Edycja"
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Usuń"
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr "Włącz ponowne udostępnianie"
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr "Zezwalaj użytkownikom na ponowne udostępnienie plików, które są im udostępnione"
diff --git a/l10n/pl/files_versions.po b/l10n/pl/files_versions.po
new file mode 100644
index 00000000000..bdacd74f04a
--- /dev/null
+++ b/l10n/pl/files_versions.po
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Cyryl Sochacki <>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 12:35+0000\n"
+"Last-Translator: Cyryl Sochacki <>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr "Wygasają wszystkie wersje"
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr "Włącz wersjonowanie plików"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 350097274e7..a3c4bafc1db 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -76,11 +76,27 @@ msgstr "Polski"
 msgid "Security Warning"
 msgstr "Ostrzeżenia bezpieczeństwa"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Więcej"
 
diff --git a/l10n/pl/tasks.po b/l10n/pl/tasks.po
new file mode 100644
index 00000000000..563964d39bc
--- /dev/null
+++ b/l10n/pl/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
new file mode 100644
index 00000000000..89148af24bc
--- /dev/null
+++ b/l10n/pl/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/pl/user_migrate.po b/l10n/pl/user_migrate.po
new file mode 100644
index 00000000000..656770d5542
--- /dev/null
+++ b/l10n/pl/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/pl/user_openid.po b/l10n/pl/user_openid.po
new file mode 100644
index 00000000000..48f7a0f6dc1
--- /dev/null
+++ b/l10n/pl/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/pt_BR/admin_dependencies_chk.po b/l10n/pt_BR/admin_dependencies_chk.po
new file mode 100644
index 00000000000..571f626c304
--- /dev/null
+++ b/l10n/pt_BR/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/pt_BR/admin_migrate.po b/l10n/pt_BR/admin_migrate.po
new file mode 100644
index 00000000000..57e754066c5
--- /dev/null
+++ b/l10n/pt_BR/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/pt_BR/calendar.po b/l10n/pt_BR/calendar.po
index 9d5c7712694..5ffc4e305f9 100644
--- a/l10n/pt_BR/calendar.po
+++ b/l10n/pt_BR/calendar.po
@@ -4,27 +4,36 @@
 # 
 # Translators:
 # Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
+# Sandro Venezuela <sandrovenezuela@gmail.com>, 2012.
 # Thiago Vicente <thiagovice@gmail.com>, 2012.
 # Van Der Fran <transifex@vanderland.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Nenhum calendário encontrado."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Nenhum evento encontrado."
 
@@ -32,300 +41,394 @@ msgstr "Nenhum evento encontrado."
 msgid "Wrong calendar"
 msgstr "Calendário incorreto"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Novo fuso horário"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Fuso horário alterado"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Pedido inválido"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Calendário"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Aniversário"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Negócio"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Chamada"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Clientes"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Entrega"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Feriados"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Idéias"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Jornada"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubileu"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Reunião"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Outros"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Pessoal"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projetos"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Perguntas"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Trabalho"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "sem nome"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Novo Calendário"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Não repetir"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Diariamente"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Semanal"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Cada dia da semana"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "De duas em duas semanas"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Mensal"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Anual"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nunca"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "por ocorrências"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "por data"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "por dia do mês"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "por dia da semana"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sábado"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Domingo"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "semana do evento no mês"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "primeiro"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "segundo"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "terceiro"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "quarto"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "quinto"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "último"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Janeiro"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Fevereiro"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Março"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Abril"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Maio"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Junho"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Julho"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Agosto"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Setembro"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Outubro"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Novembro"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Dezembro"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "eventos por data"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "por dia(s) do ano"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "por número(s) da semana"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "por dia e mês"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Data"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Cal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Todo o dia"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Novo Calendário"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Campos incompletos"
@@ -359,40 +462,32 @@ msgstr "O evento termina antes de começar"
 msgid "There was a database fail"
 msgstr "Houve uma falha de banco de dados"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Semana"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mês"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Hoje"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Calendários"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Houve uma falha, ao analisar o arquivo."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Escolha calendários ativos"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Meus Calendários"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Link para CalDav"
 
@@ -404,19 +499,19 @@ msgstr "Calendários Compartilhados"
 msgid "No shared calendars"
 msgstr "Nenhum Calendário Compartilhado"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Compartilhar Calendário"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Excluir"
@@ -502,23 +597,23 @@ msgstr "Separe as categorias por vírgulas"
 msgid "Edit categories"
 msgstr "Editar categorias"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Evento de dia inteiro"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "De"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Para"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Opções avançadas"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Local"
 
@@ -526,7 +621,7 @@ msgstr "Local"
 msgid "Location of the Event"
 msgstr "Local do evento"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Descrição"
 
@@ -534,84 +629,86 @@ msgstr "Descrição"
 msgid "Description of the Event"
 msgstr "Descrição do Evento"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Repetir"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avançado"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Selecionar dias da semana"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Selecionar dias"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "e o dia do evento no ano."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "e o dia do evento no mês."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Selecionar meses"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Selecionar semanas"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "e a semana do evento no ano."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervalo"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Final"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "ocorrências"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "criar um novo calendário"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Importar um arquivo de calendário"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Por favor, escolha o calendário"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "criar um novo calendário"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Nome do novo calendário"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importar"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importar calendário"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Calendário importado com sucesso"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Importar"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Fechar caixa de diálogo"
 
@@ -627,45 +724,73 @@ msgstr "Visualizar evento"
 msgid "No categories selected"
 msgstr "Nenhuma categoria selecionada"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Selecionar categoria"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "de"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "para"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Fuso horário"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Verificar sempre mudanças no fuso horário"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Formato da Hora"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Primeiro dia da semana"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Sincronização de endereço do calendário CalDAV :"
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index a6a3237e211..e0aa5a97bd4 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Erro ao (des)ativar agenda."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID não definido."
 
@@ -62,7 +62,7 @@ msgstr "Nenhum contato encontrado."
 msgid "There was an error adding the contact."
 msgstr "Ocorreu um erro ao adicionar o contato."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "nome do elemento não definido."
 
@@ -86,11 +86,11 @@ msgstr "Tentando adiciona propriedade duplicada:"
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informações sobre vCard é incorreta. Por favor, recarregue a página."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Erro ao excluir propriedade de contato."
 
@@ -102,19 +102,19 @@ msgstr "Faltando ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Erro de identificação VCard para ID:"
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "checksum não definido."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informação sobre vCard incorreto. Por favor, recarregue a página:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Something went FUBAR. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedades do contato."
 
@@ -163,19 +163,19 @@ msgstr "Erro ao obter propriedade da FOTO."
 msgid "Error saving contact."
 msgstr "Erro ao salvar contato."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Erro ao modificar tamanho da imagem"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Erro ao recortar imagem"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Erro ao criar imagem temporária"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Erro ao localizar imagem:"
 
@@ -275,6 +275,10 @@ msgid ""
 "on this server."
 msgstr "O arquivo que você está tentando carregar excede o tamanho máximo para este servidor."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Selecione o tipo"
@@ -533,7 +537,7 @@ msgstr "Editar detalhes do nome"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Excluir"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nova agenda"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Salvar"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po
new file mode 100644
index 00000000000..aba18662d48
--- /dev/null
+++ b/l10n/pt_BR/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po
new file mode 100644
index 00000000000..8af2e8806b4
--- /dev/null
+++ b/l10n/pt_BR/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
new file mode 100644
index 00000000000..88d7f7093c2
--- /dev/null
+++ b/l10n/pt_BR/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/pt_BR/files_versions.po b/l10n/pt_BR/files_versions.po
new file mode 100644
index 00000000000..86c54e71050
--- /dev/null
+++ b/l10n/pt_BR/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 06f2896b1d1..9900cd19029 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -74,11 +74,27 @@ msgstr "Português"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Mais"
 
diff --git a/l10n/pt_BR/tasks.po b/l10n/pt_BR/tasks.po
new file mode 100644
index 00000000000..5e8358f8c6b
--- /dev/null
+++ b/l10n/pt_BR/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
new file mode 100644
index 00000000000..206781082f4
--- /dev/null
+++ b/l10n/pt_BR/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/pt_BR/user_migrate.po b/l10n/pt_BR/user_migrate.po
new file mode 100644
index 00000000000..bb939a947ab
--- /dev/null
+++ b/l10n/pt_BR/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/pt_BR/user_openid.po b/l10n/pt_BR/user_openid.po
new file mode 100644
index 00000000000..5abf549de33
--- /dev/null
+++ b/l10n/pt_BR/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/pt_PT/admin_dependencies_chk.po b/l10n/pt_PT/admin_dependencies_chk.po
new file mode 100644
index 00000000000..33d13a5a563
--- /dev/null
+++ b/l10n/pt_PT/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/pt_PT/admin_migrate.po b/l10n/pt_PT/admin_migrate.po
new file mode 100644
index 00000000000..0daf518350a
--- /dev/null
+++ b/l10n/pt_PT/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/pt_PT/calendar.po b/l10n/pt_PT/calendar.po
index 02385945ce9..190c42bb940 100644
--- a/l10n/pt_PT/calendar.po
+++ b/l10n/pt_PT/calendar.po
@@ -10,21 +10,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Nenhum calendário encontrado."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Nenhum evento encontrado."
 
@@ -32,300 +40,394 @@ msgstr "Nenhum evento encontrado."
 msgid "Wrong calendar"
 msgstr "Calendário errado"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nova zona horária"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Zona horária alterada"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Pedido inválido"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Calendário"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM aaaa"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, aaaa"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Dia de anos"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Negócio"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Telefonar"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Clientes"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Entregar"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Férias"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideias"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Jornada"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jublieu"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Encontro"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Outro"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Pessoal"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projetos"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Perguntas"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Trabalho"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "não definido"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Novo calendário"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Não repete"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Diário"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Semanal"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Todos os dias da semana"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Bi-semanal"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Mensal"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Anual"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nunca"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "por ocorrências"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "por data"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "por dia do mês"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "por dia da semana"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Segunda"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Terça"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Quarta"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Quinta"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Sexta"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sábado"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Domingo"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "Eventos da semana do mês"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "primeiro"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "segundo"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "terçeiro"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "quarto"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "quinto"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "último"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Janeiro"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Fevereiro"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Março"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Abril"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Maio"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Junho"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Julho"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Agosto"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Setembro"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Outubro"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Novembro"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Dezembro"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "por data de evento"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "por dia(s) do ano"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "por número(s) da semana"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "por dia e mês"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Data"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Cal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Todo o dia"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Novo calendário"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Falta campos"
@@ -359,40 +461,32 @@ msgstr "O evento acaba antes de começar"
 msgid "There was a database fail"
 msgstr "Houve uma falha de base de dados"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Semana"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mês"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Hoje"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Calendários"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Houve uma falha durante a análise do ficheiro"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Escolhe calendários ativos"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Os seus calendários"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Endereço CalDav"
 
@@ -404,19 +498,19 @@ msgstr "Calendários partilhados"
 msgid "No shared calendars"
 msgstr "Nenhum calendário partilhado"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Partilhar calendário"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Apagar"
@@ -502,23 +596,23 @@ msgstr "Separe categorias por virgulas"
 msgid "Edit categories"
 msgstr "Editar categorias"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Evento de dia inteiro"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "De"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Para"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Opções avançadas"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Localização"
 
@@ -526,7 +620,7 @@ msgstr "Localização"
 msgid "Location of the Event"
 msgstr "Localização do evento"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Descrição"
 
@@ -534,84 +628,86 @@ msgstr "Descrição"
 msgid "Description of the Event"
 msgstr "Descrição do evento"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Repetir"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avançado"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Seleciona os dias da semana"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Seleciona os dias"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "e o dia de eventos do ano."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "e o dia de eventos do mês."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Seleciona os meses"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Seleciona as semanas"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "e a semana de eventos do ano."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Intervalo"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Fim"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "ocorrências"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "criar novo calendário"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Importar um ficheiro de calendário"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Por favor escolhe o calendário"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "criar novo calendário"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Nome do novo calendário"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importar"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "A importar calendário"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Calendário importado com sucesso"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Importar"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Fechar diálogo"
 
@@ -627,45 +723,73 @@ msgstr "Ver um evento"
 msgid "No categories selected"
 msgstr "Nenhuma categoria seleccionada"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Selecionar categoria"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "de"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "em"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Zona horária"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Verificar sempre por alterações na zona horária"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Formato da hora"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Primeiro dia da semana"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Endereço de sincronização CalDav do calendário"
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index 25458fe13d3..964dae21963 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Erro a (des)ativar o livro de endereços"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id não está definido"
 
@@ -62,7 +62,7 @@ msgstr "Nenhum contacto encontrado."
 msgid "There was an error adding the contact."
 msgstr "Erro ao adicionar contato"
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "o nome do elemento não está definido."
 
@@ -86,11 +86,11 @@ msgstr "A tentar adicionar propriedade duplicada: "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "A informação sobre o vCard está incorreta. Por favor refresque a página"
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Erro ao apagar propriedade do contato"
 
@@ -102,19 +102,19 @@ msgstr "Falta ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Erro a analisar VCard para o ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "Checksum não está definido."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "A informação sobre o VCard está incorrecta. Por favor refresque a página: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Algo provocou um FUBAR. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedade do contato"
 
@@ -163,19 +163,19 @@ msgstr "Erro a obter a propriedade Foto"
 msgid "Error saving contact."
 msgstr "Erro a guardar o contacto."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Erro a redimensionar a imagem"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Erro a recorar a imagem"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Erro a criar a imagem temporária"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Erro enquanto pesquisava pela imagem: "
 
@@ -275,6 +275,10 @@ msgid ""
 "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:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Seleccionar tipo"
@@ -533,7 +537,7 @@ msgstr "Editar detalhes do nome"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Apagar"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Novo livro de endereços"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
new file mode 100644
index 00000000000..ea24c46071b
--- /dev/null
+++ b/l10n/pt_PT/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
new file mode 100644
index 00000000000..b0c55a3de6e
--- /dev/null
+++ b/l10n/pt_PT/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
new file mode 100644
index 00000000000..50e951397c6
--- /dev/null
+++ b/l10n/pt_PT/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/pt_PT/files_versions.po b/l10n/pt_PT/files_versions.po
new file mode 100644
index 00000000000..5d6fb5fe067
--- /dev/null
+++ b/l10n/pt_PT/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 66854d609d8..db32bde84e1 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,27 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Mais"
 
diff --git a/l10n/pt_PT/tasks.po b/l10n/pt_PT/tasks.po
new file mode 100644
index 00000000000..405b6d903ff
--- /dev/null
+++ b/l10n/pt_PT/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
new file mode 100644
index 00000000000..a4088cac2b6
--- /dev/null
+++ b/l10n/pt_PT/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/pt_PT/user_migrate.po b/l10n/pt_PT/user_migrate.po
new file mode 100644
index 00000000000..dc1013582b8
--- /dev/null
+++ b/l10n/pt_PT/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/pt_PT/user_openid.po b/l10n/pt_PT/user_openid.po
new file mode 100644
index 00000000000..617e967bddc
--- /dev/null
+++ b/l10n/pt_PT/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/ro/admin_dependencies_chk.po b/l10n/ro/admin_dependencies_chk.po
new file mode 100644
index 00000000000..76d2d0539d3
--- /dev/null
+++ b/l10n/ro/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/ro/admin_migrate.po b/l10n/ro/admin_migrate.po
new file mode 100644
index 00000000000..44132a5cdd3
--- /dev/null
+++ b/l10n/ro/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/ro/calendar.po b/l10n/ro/calendar.po
index 0521a803f4c..bb0d41a50a7 100644
--- a/l10n/ro/calendar.po
+++ b/l10n/ro/calendar.po
@@ -11,21 +11,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Nici un calendar găsit."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Nici un eveniment găsit."
 
@@ -33,300 +41,394 @@ msgstr "Nici un eveniment găsit."
 msgid "Wrong calendar"
 msgstr "Calendar greșit"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Fus orar nou:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Fus orar schimbat"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Cerere eronată"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Calendar"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "LLL z[aaaa]{'&#8212;'[LLL] z aaaa}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Zi de naștere"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Afaceri"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Sună"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Clienți"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Curier"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Sărbători"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Idei"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Călătorie"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Aniversare"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Întâlnire"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Altele"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Personal"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Proiecte"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Întrebări"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Servici"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "fără nume"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Calendar nou"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Nerepetabil"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Zilnic"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Săptămânal"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "În fiecare zii a săptămânii"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "La fiecare două săptămâni"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Lunar"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Anual"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "niciodată"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "după repetiție"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "după dată"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "după ziua lunii"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "după ziua săptămânii"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Luni"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Marți"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Miercuri"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Joi"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Vineri"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sâmbătă"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Duminică"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "evenimentele săptămânii din luna"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "primul"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "al doilea"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "al treilea"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "al patrulea"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "al cincilea"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "ultimul"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Ianuarie"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Februarie"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Martie"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Aprilie"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mai"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Iunie"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Iulie"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "August"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Septembrie"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Octombrie"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Noiembrie"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Decembrie"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "după data evenimentului"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "după ziua(zilele) anului"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "după numărul săptămânii"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "după zi și lună"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Data"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Cal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Toată ziua"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Calendar nou"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Câmpuri lipsă"
@@ -360,40 +462,32 @@ msgstr "Evenimentul se termină înainte să înceapă"
 msgid "There was a database fail"
 msgstr "A avut loc o eroare a bazei de date"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Săptămâna"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Luna"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Listă"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Astăzi"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Calendare"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "A fost întâmpinată o eroare în procesarea fișierului"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Alege calendarele active"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Calendarele tale"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Legătură CalDav"
 
@@ -405,19 +499,19 @@ msgstr "Calendare partajate"
 msgid "No shared calendars"
 msgstr "Nici un calendar partajat"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Partajați calendarul"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Modifică"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Șterge"
@@ -503,23 +597,23 @@ msgstr "Separă categoriile prin virgule"
 msgid "Edit categories"
 msgstr "Editează categorii"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Toată ziua"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "De la"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Către"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Opțiuni avansate"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Locație"
 
@@ -527,7 +621,7 @@ msgstr "Locație"
 msgid "Location of the Event"
 msgstr "Locația evenimentului"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Descriere"
 
@@ -535,84 +629,86 @@ msgstr "Descriere"
 msgid "Description of the Event"
 msgstr "Descrierea evenimentului"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Repetă"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Avansat"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Selectează zilele săptămânii"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Selectează zilele"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "și evenimentele de zi cu zi ale anului."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "și evenimentele de zi cu zi ale lunii."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Selectează lunile"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Selectează săptămânile"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "și evenimentele săptămânale ale anului."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Interval"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Sfârșit"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "repetiții"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "crează un calendar nou"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Importă un calendar"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Alegeți calendarul"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "crează un calendar nou"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Numele noului calendar"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importă"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importă calendar"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Calendarul a fost importat cu succes"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Importă"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Închide"
 
@@ -628,45 +724,73 @@ msgstr "Vizualizează un eveniment"
 msgid "No categories selected"
 msgstr "Nici o categorie selectată"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Selecteză categoria"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "din"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "la"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Fus orar"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Verifică mereu pentru schimbări ale fusului orar"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Forma de afișare a orei"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Prima zi a săptămînii"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Adresa pentru sincronizarea calendarului CalDAV"
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index f57b3a85c78..0881e6a3b59 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "(Dez)activarea agendei a întâmpinat o eroare."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID-ul nu este stabilit"
 
@@ -62,7 +62,7 @@ msgstr "Nici un contact găsit"
 msgid "There was an error adding the contact."
 msgstr "O eroare a împiedicat adăugarea contactului."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "numele elementului nu este stabilit."
 
@@ -86,11 +86,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informațiile cărții de vizită sunt incorecte. Te rog reîncarcă pagina."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Eroare la ștergerea proprietăților contactului."
 
@@ -102,19 +102,19 @@ msgstr "ID lipsă"
 msgid "Error parsing VCard for ID: \""
 msgstr "Eroare la prelucrarea VCard-ului pentru ID:\""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "suma de control nu este stabilită."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Eroare la actualizarea proprietăților contactului."
 
@@ -163,19 +163,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -275,6 +275,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -533,7 +537,7 @@ msgstr "Introdu detalii despre nume"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Șterge"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Editează"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Agendă nouă"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Salvează"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Anulează"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po
new file mode 100644
index 00000000000..f042cb49fcf
--- /dev/null
+++ b/l10n/ro/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
new file mode 100644
index 00000000000..6b9e6f09555
--- /dev/null
+++ b/l10n/ro/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
new file mode 100644
index 00000000000..55de7e186d1
--- /dev/null
+++ b/l10n/ro/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/ro/files_versions.po b/l10n/ro/files_versions.po
new file mode 100644
index 00000000000..bb1b9526f0f
--- /dev/null
+++ b/l10n/ro/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index c55341dca23..5b756571024 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -73,11 +73,27 @@ msgstr "_language_name_"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Jurnal de activitate"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Mai mult"
 
diff --git a/l10n/ro/tasks.po b/l10n/ro/tasks.po
new file mode 100644
index 00000000000..c7869fb6c68
--- /dev/null
+++ b/l10n/ro/tasks.po
@@ -0,0 +1,107 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Dumitru Ursu <>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 20:30+0000\n"
+"Last-Translator: Dumitru Ursu <>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr "Data/timpul invalid"
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr "Sarcini"
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr "Fără categorie"
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr "Nespecificat"
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr "1=cel mai înalt"
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr "5=mediu"
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr "9=cel mai jos"
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr "Rezumat gol"
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr "Completare procentuală greșită"
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr "Prioritare greșită"
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr "Adaugă sarcină"
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr "Comandă până la"
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr "Lista de comenzi"
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr "Comandă executată"
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr "Locația comenzii"
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr "Prioritarea comenzii"
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr "Eticheta comenzii"
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr "Încărcare sarcini"
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr "Important"
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr "Mai mult"
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr "Mai puțin"
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr "Șterge"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
new file mode 100644
index 00000000000..644c43d43de
--- /dev/null
+++ b/l10n/ro/user_ldap.po
@@ -0,0 +1,165 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Dumitru Ursu <>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 20:24+0000\n"
+"Last-Translator: Dumitru Ursu <>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr "Gazdă"
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://"
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr "DN de bază"
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat"
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr "DN al utilizatorului"
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr "DN-ul clientului utilizator cu care se va efectua conectarea, d.e. uid=agent,dc=example,dc=com. Pentru acces anonim, lăsăți DN și Parolă libere."
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr "Parolă"
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr "Pentru acces anonim, lăsați DN și Parolă libere."
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr "Filtrare după Nume Utilizator"
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr "Definește fitrele care trebuie aplicate, când se încearcă conectarea. %%uid înlocuiește numele utilizatorului în procesul de conectare."
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr "folosiți substituentul %%uid , d.e. \"uid=%%uid\""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr "Filtrarea după lista utilizatorilor"
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr "Definește filtrele care trebui aplicate, când se peiau utilzatorii."
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr "fără substituenți, d.e. \"objectClass=person\"."
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr "Fitrare Grup"
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr "Definește filtrele care se aplică, când se preiau grupurile."
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr "fără substituenți, d.e. \"objectClass=posixGroup\""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr "Portul"
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr "Arborele de bază al Utilizatorilor"
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr "Arborele de bază al Grupurilor"
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr "Asocierea Grup-Membru"
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr "Utilizează TLS"
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr "A nu se utiliza pentru conexiuni SSL, va eșua."
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr "Server LDAP insensibil la majuscule (Windows)"
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr "Oprește validarea certificatelor SSL "
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr "Dacă conexiunea lucrează doar cu această opțiune, importează certificatul SSL al serverului LDAP în serverul ownCloud."
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr "Nu este recomandat, a se utiliza doar pentru testare."
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr "Câmpul cu numele vizibil al utilizatorului"
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr "Atributul LDAP folosit pentru a genera numele de utilizator din ownCloud."
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr "Câmpul cu numele grupului"
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr "Atributul LDAP folosit pentru a genera numele grupurilor din ownCloud"
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr "în octeți"
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr "în secunde. O schimbare curăță memoria tampon."
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr "Ajutor"
diff --git a/l10n/ro/user_migrate.po b/l10n/ro/user_migrate.po
new file mode 100644
index 00000000000..de0b6551e99
--- /dev/null
+++ b/l10n/ro/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/ro/user_openid.po b/l10n/ro/user_openid.po
new file mode 100644
index 00000000000..e5598de2c94
--- /dev/null
+++ b/l10n/ro/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/ru/admin_dependencies_chk.po b/l10n/ru/admin_dependencies_chk.po
new file mode 100644
index 00000000000..1d16b4f757e
--- /dev/null
+++ b/l10n/ru/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/ru/admin_migrate.po b/l10n/ru/admin_migrate.po
new file mode 100644
index 00000000000..9f8eb42ef78
--- /dev/null
+++ b/l10n/ru/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/ru/calendar.po b/l10n/ru/calendar.po
index 1d841d6166d..33e20b02e3f 100644
--- a/l10n/ru/calendar.po
+++ b/l10n/ru/calendar.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-30 09:20+0000\n"
-"Last-Translator: Nick Remeslennikov <homolibere@gmail.com>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "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"
@@ -74,31 +74,30 @@ msgstr "Неверный запрос"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Календарь"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr "ддд"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr "ддд М/д"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr "дддд М/д"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr "ММММ гггг"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr "дддд, МММ д, гггг"
 
@@ -223,7 +222,7 @@ msgstr "по дню месяца"
 msgid "by weekday"
 msgstr "по дню недели"
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Понедельник"
 
@@ -247,7 +246,7 @@ msgstr "Пятница"
 msgid "Saturday"
 msgstr "Суббота"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Воскресенье"
 
@@ -464,33 +463,25 @@ msgstr "Окончание события раньше, чем его начал
 msgid "There was a database fail"
 msgstr "Ошибка базы данных"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Неделя"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Месяц"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Список"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Сегодня"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Календари"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Не удалось обработать файл."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Выберите активные календари"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -742,55 +733,63 @@ msgstr "из"
 msgid "at"
 msgstr "на"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Часовой пояс"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Всегда проверяйте изменение часового пояса"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Формат времени"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24ч"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12ч"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Первый день недели"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr "подробнее"
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index 4efdb68140f..4c7214c485c 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -29,8 +29,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Ошибка (де)активации адресной книги."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id не установлен."
 
@@ -66,7 +66,7 @@ msgstr "Контакты не найдены."
 msgid "There was an error adding the contact."
 msgstr "Произошла ошибка при добавлении контакта."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "имя элемента не установлено."
 
@@ -90,11 +90,11 @@ msgstr "При попытке добавить дубликат:"
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Информация о vCard некорректна. Пожалуйста, обновите страницу."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Ошибка удаления информации из контакта."
 
@@ -106,19 +106,19 @@ msgstr "Отсутствует ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Ошибка обработки VCard для ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "контрольная сумма не установлена."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Информация о vCard не корректна. Перезагрузите страницу: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Что-то пошло FUBAR."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Ошибка обновления информации контакта."
 
@@ -167,19 +167,19 @@ msgstr "Ошибка при получении ФОТО."
 msgid "Error saving contact."
 msgstr "Ошибка при сохранении контактов."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Ошибка изменения размера изображений"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Ошибка обрезки изображений"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Ошибка создания временных изображений"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Ошибка поиска изображений:"
 
@@ -279,6 +279,10 @@ msgid ""
 "on this server."
 msgstr "Файл, который вы пытаетесь загрузить превышать максимальный размер загружаемых файлов на этом сервере."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Выберите тип"
@@ -537,7 +541,7 @@ msgstr "Изменить детали имени"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Удалить"
 
@@ -848,30 +852,30 @@ msgstr ""
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Редактировать"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Новая адресная книга"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Сохранить"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Отменить"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
new file mode 100644
index 00000000000..51c8bc94cc2
--- /dev/null
+++ b/l10n/ru/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
new file mode 100644
index 00000000000..72084a423c2
--- /dev/null
+++ b/l10n/ru/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
new file mode 100644
index 00000000000..1c0dc27e38c
--- /dev/null
+++ b/l10n/ru/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/ru/files_versions.po b/l10n/ru/files_versions.po
new file mode 100644
index 00000000000..f9d067172cf
--- /dev/null
+++ b/l10n/ru/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 28d5f3edccc..80974641894 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -76,11 +76,27 @@ msgstr "Русский "
 msgid "Security Warning"
 msgstr "Предупреждение безопасности"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Журнал"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Ещё"
 
diff --git a/l10n/ru/tasks.po b/l10n/ru/tasks.po
new file mode 100644
index 00000000000..202e76b9a50
--- /dev/null
+++ b/l10n/ru/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
new file mode 100644
index 00000000000..01320218dcc
--- /dev/null
+++ b/l10n/ru/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/ru/user_migrate.po b/l10n/ru/user_migrate.po
new file mode 100644
index 00000000000..bf0f6d4c8ba
--- /dev/null
+++ b/l10n/ru/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/ru/user_openid.po b/l10n/ru/user_openid.po
new file mode 100644
index 00000000000..354e17e01da
--- /dev/null
+++ b/l10n/ru/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/sk_SK/admin_dependencies_chk.po b/l10n/sk_SK/admin_dependencies_chk.po
new file mode 100644
index 00000000000..1381cc2a7f5
--- /dev/null
+++ b/l10n/sk_SK/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/sk_SK/admin_migrate.po b/l10n/sk_SK/admin_migrate.po
new file mode 100644
index 00000000000..00e8e196c08
--- /dev/null
+++ b/l10n/sk_SK/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/sk_SK/calendar.po b/l10n/sk_SK/calendar.po
index 3092e784c25..9b560742022 100644
--- a/l10n/sk_SK/calendar.po
+++ b/l10n/sk_SK/calendar.po
@@ -9,21 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Nenašiel sa žiadny kalendár."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Nenašla sa žiadna udalosť."
 
@@ -31,300 +39,394 @@ msgstr "Nenašla sa žiadna udalosť."
 msgid "Wrong calendar"
 msgstr "Zlý kalendár"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nová časová zóna:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Časové pásmo zmenené"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Neplatná požiadavka"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalendár"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM rrrr"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "d. MMM[ yyyy]{ '&#8212;' d.[ MMM] yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, rrrr"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Narodeniny"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Podnikanie"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Hovor"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klienti"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Doručovateľ"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Prázdniny"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Nápady"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Cesta"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Jubileá"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Stretnutia"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Ostatné"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Osobné"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projekty"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Otázky"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Práca"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "nepomenovaný"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Nový kalendár"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Neopakovať"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Denne"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Týždenne"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Každý deň v týždni"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Každý druhý týždeň"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Mesačne"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Ročne"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nikdy"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "podľa výskytu"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "podľa dátumu"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "podľa dňa v mesiaci"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "podľa dňa v týždni"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Pondelok"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Streda"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Piatok"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Sobota"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "týždenné udalosti v mesiaci"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "prvý"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "druhý"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "tretí"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "štvrtý"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "piaty"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "posledný"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Január"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Február"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Marec"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Apríl"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Máj"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Jún"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Júl"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "August"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "September"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Október"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "November"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "December"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "podľa dátumu udalosti"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "po dňoch"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "podľa čísel týždňov"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "podľa dňa a mesiaca"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Dátum"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kal."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Celý deň"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Nový kalendár"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Nevyplnené položky"
@@ -358,40 +460,32 @@ msgstr "Udalosť končí ešte pred tým než začne"
 msgid "There was a database fail"
 msgstr "Nastala chyba databázy"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Týždeň"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mesiac"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Zoznam"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Dnes"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendáre"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Nastala chyba počas parsovania súboru."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Zvoľte aktívne kalendáre"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Vaše kalendáre"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav odkaz"
 
@@ -403,19 +497,19 @@ msgstr "Zdielané kalendáre"
 msgid "No shared calendars"
 msgstr "Žiadne zdielané kalendáre"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Zdielať kalendár"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Upraviť"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Odstrániť"
@@ -501,23 +595,23 @@ msgstr "Kategórie oddelené čiarkami"
 msgid "Edit categories"
 msgstr "Úprava kategórií"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Celodenná udalosť"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Od"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Do"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Pokročilé možnosti"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Poloha"
 
@@ -525,7 +619,7 @@ msgstr "Poloha"
 msgid "Location of the Event"
 msgstr "Poloha udalosti"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Popis"
 
@@ -533,84 +627,86 @@ msgstr "Popis"
 msgid "Description of the Event"
 msgstr "Popis udalosti"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Opakovať"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Do času"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Vybrať dni"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "a denné udalosti v roku."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "a denné udalosti v mesiaci."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Vybrať mesiace"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Vybrať týždne"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "a týždenné udalosti v roku."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Interval"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Koniec"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "výskyty"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "vytvoriť nový kalendár"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Importovať súbor kalendára"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Prosím zvoľte kalendár"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "vytvoriť nový kalendár"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Meno nového kalendára"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importovať"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Importujem kalendár"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Kalendár úspešne importovaný"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Importovať"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Zatvoriť dialóg"
 
@@ -626,45 +722,73 @@ msgstr "Zobraziť udalosť"
 msgid "No categories selected"
 msgstr "Žiadne vybraté kategórie"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Vybrať kategóriu"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "z"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "v"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Časová zóna"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Vždy kontroluj zmeny časového pásma"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Formát času"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Prvý deň v týždni"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Synchronizačná adresa kalendára CalDAV: "
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index 1ced7f47fd4..ef45c76a922 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Chyba (de)aktivácie adresára."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID nie je nastavené."
 
@@ -62,7 +62,7 @@ msgstr "Žiadne kontakty nenájdené."
 msgid "There was an error adding the contact."
 msgstr "Vyskytla sa chyba pri pridávaní kontaktu."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "meno elementu nie je nastavené."
 
@@ -86,11 +86,11 @@ msgstr "Pokúšate sa pridať rovnaký atribút:"
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informácie o vCard sú neplatné. Prosím obnovte stránku."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Chyba odstránenia údaju kontaktu."
 
@@ -102,19 +102,19 @@ msgstr "Chýba ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Chyba pri vyňatí ID z VCard:"
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "kontrolný súčet nie je nastavený."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informácia o vCard je nesprávna. Obnovte stránku, prosím."
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Niečo sa pokazilo."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Chyba aktualizovania údaju kontaktu."
 
@@ -163,19 +163,19 @@ msgstr "Chyba počas získavania fotky."
 msgid "Error saving contact."
 msgstr "Chyba počas ukladania kontaktu."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Chyba počas zmeny obrázku."
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Chyba počas orezania obrázku."
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Chyba počas vytvárania dočasného obrázku."
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Chyba vyhľadania obrázku: "
 
@@ -275,6 +275,10 @@ msgid ""
 "on this server."
 msgstr "Súbor, ktorý sa pokúšate nahrať, presahuje maximálnu povolenú veľkosť."
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Vybrať typ"
@@ -533,7 +537,7 @@ msgstr "Upraviť podrobnosti mena"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Odstrániť"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Upraviť"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nový adresár"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Uložiť"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
new file mode 100644
index 00000000000..c7ae40ae63c
--- /dev/null
+++ b/l10n/sk_SK/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po
new file mode 100644
index 00000000000..99cbb6e3c46
--- /dev/null
+++ b/l10n/sk_SK/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
new file mode 100644
index 00000000000..30cc68b231e
--- /dev/null
+++ b/l10n/sk_SK/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/sk_SK/files_versions.po b/l10n/sk_SK/files_versions.po
new file mode 100644
index 00000000000..0b50ad267a9
--- /dev/null
+++ b/l10n/sk_SK/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index a01fe0a6648..ed5268ef8b0 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -72,11 +72,27 @@ msgstr "Slovensky"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Viac"
 
diff --git a/l10n/sk_SK/tasks.po b/l10n/sk_SK/tasks.po
new file mode 100644
index 00000000000..2ea079cbf69
--- /dev/null
+++ b/l10n/sk_SK/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
new file mode 100644
index 00000000000..1fdd9af1e54
--- /dev/null
+++ b/l10n/sk_SK/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/sk_SK/user_migrate.po b/l10n/sk_SK/user_migrate.po
new file mode 100644
index 00000000000..49ca2414b0d
--- /dev/null
+++ b/l10n/sk_SK/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/sk_SK/user_openid.po b/l10n/sk_SK/user_openid.po
new file mode 100644
index 00000000000..56440f66cc3
--- /dev/null
+++ b/l10n/sk_SK/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/sl/admin_dependencies_chk.po b/l10n/sl/admin_dependencies_chk.po
new file mode 100644
index 00000000000..0dc34327997
--- /dev/null
+++ b/l10n/sl/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/sl/admin_migrate.po b/l10n/sl/admin_migrate.po
new file mode 100644
index 00000000000..e4aec295fb2
--- /dev/null
+++ b/l10n/sl/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/sl/calendar.po b/l10n/sl/calendar.po
index d4f7e0cf0dd..b1792961b60 100644
--- a/l10n/sl/calendar.po
+++ b/l10n/sl/calendar.po
@@ -11,21 +11,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Ni bilo najdenih koledarjev."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Ni bilo najdenih dogodkov."
 
@@ -33,300 +41,394 @@ msgstr "Ni bilo najdenih dogodkov."
 msgid "Wrong calendar"
 msgstr "Napačen koledar"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Nov časovni pas:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Časovni pas je bil spremenjen"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Neveljaven zahtevek"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Koledar"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Rojstni dan"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Poslovno"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Pokliči"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Stranke"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Dobavitelj"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Dopust"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideje"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Potovanje"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Obletnica"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Sestanek"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Ostalo"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Osebno"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projekt"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Vprašanja"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Delo"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "neimenovan"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Nov koledar"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Se ne ponavlja"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Dnevno"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Tedensko"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Vsak dan v tednu"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Dvakrat tedensko"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Mesečno"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Letno"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "nikoli"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "po številu dogodkov"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "po datumu"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "po dnevu v mesecu"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "po dnevu v tednu"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "ponedeljek"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "torek"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "sreda"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "četrtek"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "petek"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "sobota"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "nedelja"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "dogodki tedna v mesecu"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "prvi"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "drugi"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "tretji"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "četrti"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "peti"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "zadnji"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "januar"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "februar"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "marec"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "april"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "maj"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "junij"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "julij"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "avgust"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "september"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "oktober"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "november"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "december"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "po datumu dogodka"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "po številu let"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "po tednu v letu"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "po dnevu in mesecu"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Datum"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Kol."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Cel dan"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Nov koledar"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Mankajoča polja"
@@ -360,40 +462,32 @@ msgstr "Dogodek se konča preden se začne"
 msgid "There was a database fail"
 msgstr "Napaka v podatkovni zbirki"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Teden"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mesec"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Seznam"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Danes"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Koledarji"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Pri razčlenjevanju datoteke je prišlo do napake."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Izberite aktivne koledarje"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "Vaši koledarji"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav povezava"
 
@@ -405,19 +499,19 @@ msgstr "Koledarji v souporabi"
 msgid "No shared calendars"
 msgstr "Ni koledarjev v souporabi"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Daj koledar v souporabo"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Prenesi"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Uredi"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Izbriši"
@@ -503,23 +597,23 @@ msgstr "Kategorije ločite z vejico"
 msgid "Edit categories"
 msgstr "Uredi kategorije"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Celodnevni dogodek"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Od"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Do"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Napredne možnosti"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Kraj"
 
@@ -527,7 +621,7 @@ msgstr "Kraj"
 msgid "Location of the Event"
 msgstr "Kraj dogodka"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Opis"
 
@@ -535,84 +629,86 @@ msgstr "Opis"
 msgid "Description of the Event"
 msgstr "Opis dogodka"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Ponovi"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Napredno"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Izberite dneve v tednu"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Izberite dneve"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "in dnevu dogodka v letu."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "in dnevu dogodka v mesecu."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Izberite mesece"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Izberite tedne"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "in tednu dogodka v letu."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Časovni razmik"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Konec"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "ponovitev"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "Ustvari nov koledar"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Uvozi datoteko koledarja"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Izberi koledar"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "Ustvari nov koledar"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Ime novega koledarja"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Uvozi"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Uvažam koledar"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Koledar je bil uspešno uvožen"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Uvozi"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Zapri dialog"
 
@@ -628,45 +724,73 @@ msgstr "Poglej dogodek"
 msgid "No categories selected"
 msgstr "Nobena kategorija ni izbrana"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Izberi kategorijo"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "od"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "pri"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Časovni pas"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Vedno preveri za spremembe časovnega pasu"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Zapis časa"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24ur"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12ur"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Prvi dan v tednu"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "CalDAV sinhronizacijski naslov koledarja:"
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index 5c48279297b..765e127a418 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Napaka med (de)aktivacijo imenika."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id ni nastavljen."
 
@@ -62,7 +62,7 @@ msgstr "Ni bilo najdenih stikov."
 msgid "There was an error adding the contact."
 msgstr "Med dodajanjem stika je prišlo do napake"
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "ime elementa ni nastavljeno."
 
@@ -86,11 +86,11 @@ msgstr "Poskušam dodati podvojeno lastnost:"
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacije o vCard niso pravilne. Prosimo, če ponovno naložite stran."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Napaka pri brisanju lastnosti stika."
 
@@ -102,19 +102,19 @@ msgstr "Manjkajoč ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Napaka pri razčlenjevanju VCard za ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "nadzorna vsota ni nastavljena."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Nekaj je šlo v franže. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Napaka pri posodabljanju lastnosti stika."
 
@@ -163,19 +163,19 @@ msgstr "Napaka pri pridobivanju lastnosti fotografije."
 msgid "Error saving contact."
 msgstr "Napaka pri shranjevanju stika."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Napaka pri spreminjanju velikosti slike"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Napaka pri obrezovanju slike"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Napaka pri ustvarjanju začasne slike"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Napaka pri iskanju datoteke: "
 
@@ -275,6 +275,10 @@ msgid ""
 "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:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Izberite vrsto"
@@ -533,7 +537,7 @@ msgstr "Uredite podrobnosti imena"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "Prenesi"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Uredi"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Nov imenik"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Shrani"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 27019afd797..4fa6cd3746f 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:04+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,23 +64,23 @@ msgstr "Izbriši"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "že obstaja"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "nadomesti"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "ekliči"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "nadomeščen"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "z"
 
 #: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
@@ -114,27 +114,27 @@ msgstr "Nalaganje je bilo preklicano."
 msgid "Invalid name, '/' is not allowed."
 msgstr "Neveljavno ime. Znak '/' ni dovoljen."
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:694 templates/index.php:55
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:695 templates/index.php:56
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/files.js:659
+#: js/files.js:722
 msgid "folder"
 msgstr "mapa"
 
-#: js/files.js:661
+#: js/files.js:724
 msgid "folders"
 msgstr "mape"
 
-#: js/files.js:669
+#: js/files.js:732
 msgid "file"
 msgstr "datoteka"
 
-#: js/files.js:671
+#: js/files.js:734
 msgid "files"
 msgstr "datoteke"
 
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
new file mode 100644
index 00000000000..ee97cf3b746
--- /dev/null
+++ b/l10n/sl/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
new file mode 100644
index 00000000000..b43660a42e7
--- /dev/null
+++ b/l10n/sl/files_external.po
@@ -0,0 +1,83 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-15 00:03+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr "Vsi uporabniki"
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr "Skupine"
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr "Uporabniki"
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr "Izbriši"
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr "SSL korenski certifikati"
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr "Uvozi korenski certifikat"
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr "Omogoči"
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
new file mode 100644
index 00000000000..e6928f35fac
--- /dev/null
+++ b/l10n/sl/files_sharing.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 12:59+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr "Vaše datoteke v souporabi"
+
+#: templates/list.php:6
+msgid "Item"
+msgstr "Predmet"
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr "V souporabi z"
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr "Dovoljenja"
+
+#: templates/list.php:16
+msgid "Read"
+msgstr "Branje"
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr "Pisanje"
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Izbris"
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr "Omogoči nadaljnjo izmenjavo"
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr "Dovoli uporabnikom nadaljnjo izmenjavo tujih datotek"
diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po
new file mode 100644
index 00000000000..29a2310e260
--- /dev/null
+++ b/l10n/sl/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 7d09d17dd1c..31f679ac7f0 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:09+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Ne morem naložiti seznama iz App Store"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -50,7 +50,7 @@ msgstr "Jezik je bil spremenjen"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Napaka"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -72,11 +72,27 @@ msgstr "__ime_jezika__"
 msgid "Security Warning"
 msgstr "Varnostno opozorilo"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr "Periodično opravilo"
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr "izvedi eno nalogo z vsako naloženo stranjo"
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr "cron.php je vpisan na storitev webcron"
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr "uporabi sistemski servis za periodična opravila"
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Dnevnik"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Več"
 
diff --git a/l10n/sl/tasks.po b/l10n/sl/tasks.po
new file mode 100644
index 00000000000..484d5c1f727
--- /dev/null
+++ b/l10n/sl/tasks.po
@@ -0,0 +1,107 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:45+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr "Neveljaven datum/čas"
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr "Opravila"
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr "Ni kategorije"
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr "Nedoločen"
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr "1=najvišje"
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr "5=srednje"
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr "9=najnižje"
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr "Prazen povzetek"
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr "Neveljavna prednost"
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr "Dodaj opravilo"
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr "Več"
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr "Manj"
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
new file mode 100644
index 00000000000..b46b9b67977
--- /dev/null
+++ b/l10n/sl/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/sl/user_migrate.po b/l10n/sl/user_migrate.po
new file mode 100644
index 00000000000..ec8deacf770
--- /dev/null
+++ b/l10n/sl/user_migrate.po
@@ -0,0 +1,52 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:17+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr "Izvozi"
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr "Med ustvarjanjem datoteke za izvoz je prišlo do napake"
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr "Prišlo je do napake"
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr "Izvozi vaš uporabniški račun"
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr "Ustvarjena bo stisnjena datoteka z vašim ownCloud računom."
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr "Uvozi uporabniški račun"
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr "Zip datoteka ownCloud uporabnika"
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr "Uvozi"
diff --git a/l10n/sl/user_openid.po b/l10n/sl/user_openid.po
new file mode 100644
index 00000000000..62302b69119
--- /dev/null
+++ b/l10n/sl/user_openid.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:13+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr "To je OpenID strežniška končna točka. Za več informacij si oglejte"
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr "Istovetnost: <b>"
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr "Uporabnik:"
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr "Prijava"
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr "Napaka: <b>Uporabnik ni bil izbran"
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr "s tem naslovom se lahko overite tudi na drugih straneh"
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr "Odobren OpenID ponudnik"
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr "Vaš naslov na Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/so/admin_dependencies_chk.po b/l10n/so/admin_dependencies_chk.po
new file mode 100644
index 00000000000..2d1d442a09b
--- /dev/null
+++ b/l10n/so/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/so/admin_migrate.po b/l10n/so/admin_migrate.po
new file mode 100644
index 00000000000..2f3aebc46ea
--- /dev/null
+++ b/l10n/so/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/so/calendar.po b/l10n/so/calendar.po
index 139a523a52c..eb308550f95 100644
--- a/l10n/so/calendar.po
+++ b/l10n/so/calendar.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -69,31 +69,30 @@ msgstr ""
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
@@ -218,7 +217,7 @@ msgstr ""
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
@@ -242,7 +241,7 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
@@ -459,32 +458,24 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:44
-msgid "Today"
-msgstr ""
-
 #: templates/calendar.php:45
-msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
+msgid "Today"
 msgstr ""
 
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
 #: templates/part.choosecalendar.php:2
@@ -737,55 +728,63 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/so/contacts.po b/l10n/so/contacts.po
index e200e45abae..48bc4a90b16 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -530,7 +534,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr ""
 
@@ -841,30 +845,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/so/files_encryption.po b/l10n/so/files_encryption.po
new file mode 100644
index 00000000000..eb887dea6cf
--- /dev/null
+++ b/l10n/so/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/so/files_external.po b/l10n/so/files_external.po
new file mode 100644
index 00000000000..668e7833888
--- /dev/null
+++ b/l10n/so/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/so/files_sharing.po b/l10n/so/files_sharing.po
new file mode 100644
index 00000000000..c0534448eec
--- /dev/null
+++ b/l10n/so/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/so/files_versions.po b/l10n/so/files_versions.po
new file mode 100644
index 00000000000..0c1f4e95a6e
--- /dev/null
+++ b/l10n/so/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
index 5c073c49399..d9257419c77 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -69,11 +69,27 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/so/tasks.po b/l10n/so/tasks.po
new file mode 100644
index 00000000000..3b036ed9b2b
--- /dev/null
+++ b/l10n/so/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/so/user_ldap.po b/l10n/so/user_ldap.po
new file mode 100644
index 00000000000..bf35a13096a
--- /dev/null
+++ b/l10n/so/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/so/user_migrate.po b/l10n/so/user_migrate.po
new file mode 100644
index 00000000000..40d3c1c0733
--- /dev/null
+++ b/l10n/so/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/so/user_openid.po b/l10n/so/user_openid.po
new file mode 100644
index 00000000000..2001365d2d2
--- /dev/null
+++ b/l10n/so/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/sr/admin_dependencies_chk.po b/l10n/sr/admin_dependencies_chk.po
new file mode 100644
index 00000000000..bc9e8912ee7
--- /dev/null
+++ b/l10n/sr/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/sr/admin_migrate.po b/l10n/sr/admin_migrate.po
new file mode 100644
index 00000000000..13be5b1a58b
--- /dev/null
+++ b/l10n/sr/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/sr/calendar.po b/l10n/sr/calendar.po
index 4245b5f8f00..4e95b27e793 100644
--- a/l10n/sr/calendar.po
+++ b/l10n/sr/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr ""
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr ""
 
@@ -30,300 +38,394 @@ msgstr ""
 msgid "Wrong calendar"
 msgstr "Погрешан календар"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Временска зона је промењена"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Неисправан захтев"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Календар"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Рођендан"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Посао"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Позив"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Клијенти"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Достављач"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Празници"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Идеје"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "путовање"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "јубилеј"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Састанак"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Друго"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Лично"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Пројекти"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Питања"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Посао"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Нови календар"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Не понавља се"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "дневно"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "недељно"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "сваког дана у недељи"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "двонедељно"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "месечно"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "годишње"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr ""
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr ""
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr ""
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr ""
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr ""
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr ""
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr ""
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr ""
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr ""
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr ""
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr ""
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr ""
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr ""
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr ""
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr ""
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr ""
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr ""
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr ""
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr ""
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr ""
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr ""
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr ""
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr ""
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr ""
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr ""
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr ""
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr ""
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Цео дан"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Нови календар"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr ""
@@ -357,40 +459,32 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Недеља"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Месец"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Списак"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Данас"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Календари"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "дошло је до грешке при расчлањивању фајла."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Изаберите активне календаре"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr ""
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "КалДав веза"
 
@@ -402,19 +496,19 @@ msgstr ""
 msgid "No shared calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Преузми"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Уреди"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Обриши"
@@ -500,23 +594,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Целодневни догађај"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Од"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "До"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr ""
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Локација"
 
@@ -524,7 +618,7 @@ msgstr "Локација"
 msgid "Location of the Event"
 msgstr "Локација догађаја"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Опис"
 
@@ -532,84 +626,86 @@ msgstr "Опис"
 msgid "Description of the Event"
 msgstr "Опис догађаја"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Понављај"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr ""
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr ""
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr ""
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr ""
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr ""
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr ""
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
+#: templates/part.import.php:14
+msgid "create a new calendar"
 msgstr ""
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
+#: templates/part.import.php:17
+msgid "Import a calendar file"
 msgstr ""
 
-#: templates/part.import.php:10
-msgid "create a new calendar"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
 msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
+#: templates/part.import.php:44
+msgid "Take an available name!"
 msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
+#: templates/part.import.php:47
+msgid "Import"
 msgstr ""
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr ""
 
@@ -625,44 +721,72 @@ msgstr ""
 msgid "No categories selected"
 msgstr ""
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Изаберите категорију"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Временска зона"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
 msgstr ""
 
 #: templates/share.dropdown.php:20
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index 96f1ec9f357..87d87ab2e5d 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -60,7 +60,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -84,11 +84,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Подаци о вКарти су неисправни. Поново учитајте страницу."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -100,19 +100,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,19 +161,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -531,7 +535,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Обриши"
 
@@ -842,30 +846,30 @@ msgstr ""
 msgid "Download"
 msgstr "Преузимање"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Уреди"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Нови адресар"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Сними"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Откажи"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/sr/files_encryption.po b/l10n/sr/files_encryption.po
new file mode 100644
index 00000000000..b1c6edcc0c1
--- /dev/null
+++ b/l10n/sr/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
new file mode 100644
index 00000000000..4dd07191910
--- /dev/null
+++ b/l10n/sr/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
new file mode 100644
index 00000000000..b3e8247b76b
--- /dev/null
+++ b/l10n/sr/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/sr/files_versions.po b/l10n/sr/files_versions.po
new file mode 100644
index 00000000000..e25e3766f30
--- /dev/null
+++ b/l10n/sr/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 30c688852ae..8a1ec02ddbf 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -70,11 +70,27 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/sr/tasks.po b/l10n/sr/tasks.po
new file mode 100644
index 00000000000..d20e414436b
--- /dev/null
+++ b/l10n/sr/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
new file mode 100644
index 00000000000..4e3f01a3b62
--- /dev/null
+++ b/l10n/sr/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/sr/user_migrate.po b/l10n/sr/user_migrate.po
new file mode 100644
index 00000000000..9c6020b5fc4
--- /dev/null
+++ b/l10n/sr/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/sr/user_openid.po b/l10n/sr/user_openid.po
new file mode 100644
index 00000000000..a5de6c42c8d
--- /dev/null
+++ b/l10n/sr/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/sr@latin/admin_dependencies_chk.po b/l10n/sr@latin/admin_dependencies_chk.po
new file mode 100644
index 00000000000..826e736f5e3
--- /dev/null
+++ b/l10n/sr@latin/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/sr@latin/admin_migrate.po b/l10n/sr@latin/admin_migrate.po
new file mode 100644
index 00000000000..b76fec786a6
--- /dev/null
+++ b/l10n/sr@latin/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/sr@latin/calendar.po b/l10n/sr@latin/calendar.po
index cfea90215cb..fd13b07471f 100644
--- a/l10n/sr@latin/calendar.po
+++ b/l10n/sr@latin/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr ""
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr ""
 
@@ -30,300 +38,394 @@ msgstr ""
 msgid "Wrong calendar"
 msgstr "Pogrešan kalendar"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr ""
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Vremenska zona je promenjena"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Neispravan zahtev"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Rođendan"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Posao"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Poziv"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Klijenti"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Dostavljač"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Praznici"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ideje"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "putovanje"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "jubilej"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Drugo"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Lično"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projekti"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Pitanja"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Novi kalendar"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Ne ponavlja se"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "dnevno"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "nedeljno"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "svakog dana u nedelji"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "dvonedeljno"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "mesečno"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "godišnje"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr ""
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr ""
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr ""
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr ""
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr ""
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr ""
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr ""
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr ""
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr ""
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr ""
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr ""
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr ""
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr ""
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr ""
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr ""
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr ""
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr ""
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr ""
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr ""
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr ""
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr ""
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr ""
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr ""
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr ""
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr ""
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr ""
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr ""
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Ceo dan"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Novi kalendar"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr ""
@@ -357,40 +459,32 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Nedelja"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Mesec"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Spisak"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Danas"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Kalendari"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "došlo je do greške pri rasčlanjivanju fajla."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Izaberite aktivne kalendare"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr ""
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "KalDav veza"
 
@@ -402,19 +496,19 @@ msgstr ""
 msgid "No shared calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Uredi"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Obriši"
@@ -500,23 +594,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Celodnevni događaj"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Od"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Do"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr ""
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Lokacija"
 
@@ -524,7 +618,7 @@ msgstr "Lokacija"
 msgid "Location of the Event"
 msgstr "Lokacija događaja"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Opis"
 
@@ -532,84 +626,86 @@ msgstr "Opis"
 msgid "Description of the Event"
 msgstr "Opis događaja"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Ponavljaj"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr ""
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr ""
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr ""
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr ""
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr ""
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr ""
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
+#: templates/part.import.php:14
+msgid "create a new calendar"
 msgstr ""
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
+#: templates/part.import.php:17
+msgid "Import a calendar file"
 msgstr ""
 
-#: templates/part.import.php:10
-msgid "create a new calendar"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
 msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
+#: templates/part.import.php:44
+msgid "Take an available name!"
 msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
+#: templates/part.import.php:47
+msgid "Import"
 msgstr ""
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr ""
 
@@ -625,44 +721,72 @@ msgstr ""
 msgid "No categories selected"
 msgstr ""
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Izaberite kategoriju"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Vremenska zona"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
 msgstr ""
 
 #: templates/share.dropdown.php:20
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index 535012fa250..25c7058c75a 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -60,7 +60,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -84,11 +84,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Podaci o vKarti su neispravni. Ponovo učitajte stranicu."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -100,19 +100,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,19 +161,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -531,7 +535,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Obriši"
 
@@ -842,30 +846,30 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Uredi"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/sr@latin/files_encryption.po b/l10n/sr@latin/files_encryption.po
new file mode 100644
index 00000000000..c6f3f5b636c
--- /dev/null
+++ b/l10n/sr@latin/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
new file mode 100644
index 00000000000..639f9f143bf
--- /dev/null
+++ b/l10n/sr@latin/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
new file mode 100644
index 00000000000..43f1f498e7f
--- /dev/null
+++ b/l10n/sr@latin/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/sr@latin/files_versions.po b/l10n/sr@latin/files_versions.po
new file mode 100644
index 00000000000..5fae2a88e1d
--- /dev/null
+++ b/l10n/sr@latin/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 997b911c207..b0d7bcaa1aa 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -70,11 +70,27 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/sr@latin/tasks.po b/l10n/sr@latin/tasks.po
new file mode 100644
index 00000000000..c4dff86e0a6
--- /dev/null
+++ b/l10n/sr@latin/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
new file mode 100644
index 00000000000..c37681c1218
--- /dev/null
+++ b/l10n/sr@latin/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/sr@latin/user_migrate.po b/l10n/sr@latin/user_migrate.po
new file mode 100644
index 00000000000..198d0844fdd
--- /dev/null
+++ b/l10n/sr@latin/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/sr@latin/user_openid.po b/l10n/sr@latin/user_openid.po
new file mode 100644
index 00000000000..0c9792f1bb0
--- /dev/null
+++ b/l10n/sr@latin/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/sv/admin_dependencies_chk.po b/l10n/sv/admin_dependencies_chk.po
new file mode 100644
index 00000000000..daf145daa7d
--- /dev/null
+++ b/l10n/sv/admin_dependencies_chk.po
@@ -0,0 +1,74 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 10:16+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr "Modulen php-json behövs av många applikationer som interagerar."
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr "Modulen php-curl behövs för att hämta sidans titel när du lägger till bokmärken."
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr "Modulen php-gd behövs för att skapa miniatyrer av dina bilder."
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr "Modulen php-ldap behövs för att ansluta mot din ldapserver."
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr "Modulen php-zip behövs för att kunna ladda ner flera filer på en gång."
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr "Modulen php-mb_multibyte behövs för att hantera korrekt teckenkodning."
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr "Modulen php-ctype behövs för att validera data."
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr "Modulen php-xml behövs för att kunna dela filer med webdav."
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr "Direktivet allow_url_fopen i php.ini bör sättas till 1 för att kunna hämta kunskapsbasen från OCS-servrar."
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr "Modulen php-pdo behövs för att kunna lagra ownCloud data i en databas."
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr "Beroenden status"
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr "Används av:"
diff --git a/l10n/sv/admin_migrate.po b/l10n/sv/admin_migrate.po
new file mode 100644
index 00000000000..68573f42214
--- /dev/null
+++ b/l10n/sv/admin_migrate.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 09:53+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr "Exportera denna instans av ownCloud"
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr "Detta kommer att skapa en komprimerad fil som innehåller all data från denna instans av ownCloud.\n            Välj exporttyp:"
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr "Exportera"
diff --git a/l10n/sv/calendar.po b/l10n/sv/calendar.po
index b2bce445e15..1d0bf440909 100644
--- a/l10n/sv/calendar.po
+++ b/l10n/sv/calendar.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-29 20:35+0000\n"
-"Last-Translator: maghog <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "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"
@@ -73,31 +73,30 @@ msgstr "Ogiltig begäran"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Kalender"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr "MMMM åååå"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr "ddd, MMM d, åååå"
 
@@ -222,7 +221,7 @@ msgstr "efter dag i månaden"
 msgid "by weekday"
 msgstr "efter veckodag"
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Måndag"
 
@@ -246,7 +245,7 @@ msgstr "Fredag"
 msgid "Saturday"
 msgstr "Lördag"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Söndag"
 
@@ -463,33 +462,25 @@ msgstr "Händelsen slutar innan den börjar"
 msgid "There was a database fail"
 msgstr "Det blev ett databasfel"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Vecka"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Månad"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Lista"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Idag"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Kalendrar"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Det blev ett fel medan filen analyserades."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Välj aktiva kalendrar"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -741,55 +732,63 @@ msgstr "av"
 msgid "at"
 msgstr "på"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Tidszon"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Kontrollera alltid ändringar i tidszon."
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Tidsformat"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Första dagen av veckan"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr "Cache"
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr "Töm cache för upprepade händelser"
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr "Kalender CalDAV synkroniserar adresser"
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr "mer info"
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr "Primary address (Kontact et al)"
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr "Read only iCalendar link(s)"
 
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index 2e83ae869bd..ec6bc7bdca8 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-06 02:01+0200\n"
-"PO-Revision-Date: 2012-08-05 17:56+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "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"
@@ -28,8 +28,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Fel (av)aktivera adressbok."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ID är inte satt."
 
@@ -65,7 +65,7 @@ msgstr "Inga kontakter funna."
 msgid "There was an error adding the contact."
 msgstr "Det uppstod ett fel när kontakten skulle läggas till."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "elementnamn ej angett."
 
@@ -89,11 +89,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr "Kunde inte lägga till egenskap för kontakt:"
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Information om vCard är felaktigt. Vänligen ladda om sidan."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Fel uppstod när kontaktegenskap skulle tas bort."
 
@@ -105,19 +105,19 @@ msgstr "ID saknas"
 msgid "Error parsing VCard for ID: \""
 msgstr "Fel vid läsning av VCard för ID: \""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "kontrollsumma är inte satt."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informationen om vCard är fel. Ladda om sidan:"
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Något gick fel."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Fel uppstod när kontaktegenskap skulle uppdateras."
 
@@ -166,19 +166,19 @@ msgstr "Fel vid hämtning av egenskaper för FOTO."
 msgid "Error saving contact."
 msgstr "Fel vid sparande av kontakt."
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Fel vid storleksförändring av bilden"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Fel vid beskärning av bilden"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Fel vid skapande av tillfällig bild"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Kunde inte hitta bild:"
 
@@ -278,6 +278,10 @@ msgid ""
 "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:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Välj typ"
@@ -536,7 +540,7 @@ msgstr "Redigera detaljer för namn"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Radera"
 
@@ -847,30 +851,30 @@ msgstr "Visa skrivskyddad VCF-länk"
 msgid "Download"
 msgstr "Nedladdning"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Redigera"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Ny adressbok"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr "Namn"
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr "Beskrivning"
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Spara"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr "Mer..."
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
new file mode 100644
index 00000000000..42165069483
--- /dev/null
+++ b/l10n/sv/files_encryption.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 10:20+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr "Exkludera följande filtyper från kryptering"
+
+#: templates/settings.php:5
+msgid "None"
+msgstr "Ingen"
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr "Aktivera kryptering"
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
new file mode 100644
index 00000000000..a010550da65
--- /dev/null
+++ b/l10n/sv/files_external.po
@@ -0,0 +1,83 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 10:31+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr "Extern lagring"
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr "Monteringspunkt"
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr "Källa"
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr "Alternativ"
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr "Tillämplig"
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr "Lägg till monteringspunkt"
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr "Ingen angiven"
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr "Alla användare"
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr "Grupper"
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr "Användare"
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr "Radera"
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr "SSL rotcertifikat"
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr "Importera rotcertifikat"
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr "Aktivera extern lagring för användare"
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr "Tillåt användare att montera egen extern lagring"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
new file mode 100644
index 00000000000..d48e54c2778
--- /dev/null
+++ b/l10n/sv/files_sharing.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 10:19+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr "Dina delade filer"
+
+#: templates/list.php:6
+msgid "Item"
+msgstr "Objekt"
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr "Delad med"
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr "Rättigheter"
+
+#: templates/list.php:16
+msgid "Read"
+msgstr "Läsa"
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr "Ändra"
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "Radera"
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr "Aktivera dela vidare"
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr "Tillåter användare att dela filer som dom inte äger"
diff --git a/l10n/sv/files_versions.po b/l10n/sv/files_versions.po
new file mode 100644
index 00000000000..f33072ac6d9
--- /dev/null
+++ b/l10n/sv/files_versions.po
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 10:33+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr "Upphör alla versioner"
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr "Aktivera versionshantering"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index f8c317b7d53..759aac3b942 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-06 02:02+0200\n"
-"PO-Revision-Date: 2012-08-05 17:03+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "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"
@@ -76,11 +76,27 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr "Säkerhetsvarning"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Mera"
 
diff --git a/l10n/sv/tasks.po b/l10n/sv/tasks.po
new file mode 100644
index 00000000000..b397a7d18da
--- /dev/null
+++ b/l10n/sv/tasks.po
@@ -0,0 +1,107 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 13:36+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr "Felaktigt datum/tid"
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr "Uppgifter"
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr "Ingen kategori"
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr "Ospecificerad "
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr "1=högsta"
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr "5=mellan"
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr "9=lägsta"
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr "Tom sammanfattning"
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr "Ogiltig andel procent klar"
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr "Felaktig prioritet"
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr "Lägg till uppgift"
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr "Förfaller"
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr "Kategori"
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr "Slutförd"
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr "Plats"
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr "Prioritet"
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr "Etikett"
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr "Laddar uppgifter..."
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr "Viktigt"
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr "Mer"
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr "Mindre"
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr "Radera"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
new file mode 100644
index 00000000000..55f7bbecf97
--- /dev/null
+++ b/l10n/sv/user_ldap.po
@@ -0,0 +1,165 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 12:33+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr "Server"
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://"
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr "Start DN"
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr "Du kan ange start DN för användare och grupper under fliken Avancerat"
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr "Användare DN"
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr "DN för användaren som skall användas, t.ex. uid=agent, dc=example, dc=com. För anonym åtkomst, lämna DN och lösenord tomt."
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr "Lösenord"
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr "För anonym åtkomst, lämna DN och lösenord tomt."
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr "Filter logga in användare"
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr "Definierar filter att tillämpa vid inloggningsförsök. %% uid ersätter användarnamn i loginåtgärden."
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr "använd platshållare %%uid, t ex \"uid=%%uid\""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr "Filter lista användare"
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr "Definierar filter att tillämpa vid listning av användare."
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr "utan platshållare, t.ex. \"objectClass=person\"."
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr "Gruppfilter"
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr "Definierar filter att tillämpa vid listning av grupper."
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr "utan platshållare, t.ex. \"objectClass=posixGroup\"."
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr "Port"
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr "Bas för användare i katalogtjänst"
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr "Bas för grupper i katalogtjänst"
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr "Attribut för gruppmedlemmar"
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr "Använd TLS"
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr "Använd inte för SSL-anslutningar, det kommer inte att fungera."
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr "LDAP-servern är okänslig för gemener och versaler (Windows)"
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr "Stäng av verifiering av SSL-certifikat."
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr "Om anslutningen bara fungerar med det här alternativet, importera LDAP-serverns SSL-certifikat i din ownCloud-server."
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr "Rekommenderas inte, använd bara för test. "
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr "Attribut för användarnamn"
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr "Attribut som används för att generera användarnamn i ownCloud."
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr "Attribut för gruppnamn"
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr "Attribut som används för att generera gruppnamn i ownCloud."
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr "i bytes"
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr "i sekunder. En förändring tömmer cache."
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr "Hjälp"
diff --git a/l10n/sv/user_migrate.po b/l10n/sv/user_migrate.po
new file mode 100644
index 00000000000..3c9b00b3f6f
--- /dev/null
+++ b/l10n/sv/user_migrate.po
@@ -0,0 +1,52 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 12:39+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr "Exportera"
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr "Något gick fel när exportfilen skulle genereras"
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr "Ett fel har uppstått"
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr "Exportera ditt användarkonto"
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr "Detta vill skapa en komprimerad fil som innehåller ditt ownCloud-konto."
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr "Importera ett användarkonto"
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr "ownCloud  Zip-fil"
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr "Importera"
diff --git a/l10n/sv/user_openid.po b/l10n/sv/user_openid.po
new file mode 100644
index 00000000000..f05dbf48fd2
--- /dev/null
+++ b/l10n/sv/user_openid.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-13 13:42+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr "Detta är en OpenID-server slutpunkt. För mer information, se"
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr "Identitet: <b>"
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr "Realm: <b>"
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr "Användare: <b>"
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr "Logga in"
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr "Fel: <b>Ingen användare vald"
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr "du kan autentisera till andra webbplatser med denna adress"
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr "Godkänd openID leverantör"
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr "Din adress på Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
new file mode 100644
index 00000000000..7ebf04e55cf
--- /dev/null
+++ b/l10n/templates/admin_dependencies_chk.pot
@@ -0,0 +1,71 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-15 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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid "The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve "
+"knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/templates/admin_migrate.pot b/l10n/templates/admin_migrate.pot
new file mode 100644
index 00000000000..e905c22f86b
--- /dev/null
+++ b/l10n/templates/admin_migrate.pot
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-15 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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud "
+"instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 0923b3560e8..b96ce9f1e77 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-09 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 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 9afce66a0cc..751969a0bfe 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-09 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 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"
@@ -69,31 +69,30 @@ msgstr ""
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
@@ -218,7 +217,7 @@ msgstr ""
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr ""
 
@@ -242,7 +241,7 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr ""
 
@@ -459,32 +458,24 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr ""
 
-#: templates/calendar.php:44
-msgid "Today"
-msgstr ""
-
 #: templates/calendar.php:45
-msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
+msgid "Today"
 msgstr ""
 
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
 msgstr ""
 
 #: templates/part.choosecalendar.php:2
@@ -737,55 +728,63 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr ""
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index 45d062ecbc6..92d0ca5fc13 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-09 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 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"
@@ -22,8 +22,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -99,19 +99,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -160,19 +160,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -272,6 +272,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -805,11 +809,11 @@ msgstr ""
 msgid "Select Address Books"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
 msgstr ""
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
 msgstr ""
 
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index e078d4ab05c..99b041e1c82 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-09 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:574
 msgid "January"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:574
 msgid "February"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:574
 msgid "March"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:574
 msgid "April"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:574
 msgid "May"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:574
 msgid "June"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "July"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "August"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "September"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "October"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "November"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "December"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 43eeb2aba40..26f5eacee83 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-09 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 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/files_encryption.pot b/l10n/templates/files_encryption.pot
new file mode 100644
index 00000000000..a463731bf95
--- /dev/null
+++ b/l10n/templates/files_encryption.pot
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-15 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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
new file mode 100644
index 00000000000..0674e0b95d4
--- /dev/null
+++ b/l10n/templates/files_external.pot
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-15 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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
new file mode 100644
index 00000000000..c74bc72d36a
--- /dev/null
+++ b/l10n/templates/files_sharing.pot
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-15 02:03+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
new file mode 100644
index 00000000000..7a68a39a418
--- /dev/null
+++ b/l10n/templates/files_versions.pot
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-15 02:03+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 740cbaedeab..e77e777229a 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-09 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:03+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"
@@ -36,23 +36,3 @@ msgstr ""
 #: templates/index.php:27
 msgid "Slideshow"
 msgstr ""
-
-#: templates/view_album.php:19
-msgid "Back"
-msgstr ""
-
-#: templates/view_album.php:36
-msgid "Remove confirmation"
-msgstr ""
-
-#: templates/view_album.php:37
-msgid "Do you want to remove album"
-msgstr ""
-
-#: templates/view_album.php:40
-msgid "Change album name"
-msgstr ""
-
-#: templates/view_album.php:43
-msgid "New album name"
-msgstr ""
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index bc1291279c4..97bbaa86450 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-09 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:03+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 568fa545787..fb5d0a755df 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-09 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:03+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 a53e2109977..b0ea4703cce 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-09 02:02+0200\n"
+"POT-Creation-Date: 2012-08-15 02:03+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"
@@ -69,11 +69,27 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/templates/tasks.pot b/l10n/templates/tasks.pot
new file mode 100644
index 00000000000..b23ae36239a
--- /dev/null
+++ b/l10n/templates/tasks.pot
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-15 02:03+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
new file mode 100644
index 00000000000..f554a64978b
--- /dev/null
+++ b/l10n/templates/user_ldap.pot
@@ -0,0 +1,163 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-15 02:03+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,"
+"dc=example,dc=com. For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/templates/user_migrate.pot b/l10n/templates/user_migrate.pot
new file mode 100644
index 00000000000..0367e1a634b
--- /dev/null
+++ b/l10n/templates/user_migrate.pot
@@ -0,0 +1,50 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-15 02:03+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/templates/user_openid.pot b/l10n/templates/user_openid.pot
new file mode 100644
index 00000000000..211f8054b1a
--- /dev/null
+++ b/l10n/templates/user_openid.pot
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-15 02:03+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/th_TH/admin_dependencies_chk.po b/l10n/th_TH/admin_dependencies_chk.po
new file mode 100644
index 00000000000..6ba6dff16af
--- /dev/null
+++ b/l10n/th_TH/admin_dependencies_chk.po
@@ -0,0 +1,74 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:17+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr "ใช้งานโดย:"
diff --git a/l10n/th_TH/admin_migrate.po b/l10n/th_TH/admin_migrate.po
new file mode 100644
index 00000000000..c3f57864015
--- /dev/null
+++ b/l10n/th_TH/admin_migrate.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:09+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr "ส่งออกข้อมูลค่าสมมุติของ ownCloud นี้"
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr "ส่วนนี้จะเป็นการสร้างไฟล์บีบอัดที่บรรจุข้อมูลค่าสมมุติของ ownCloud.\n            กรุณาเลือกชนิดของการส่งออกข้อมูล:"
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr "ส่งออก"
diff --git a/l10n/th_TH/bookmarks.po b/l10n/th_TH/bookmarks.po
index e5a515c7dc2..0c6e7c61e3d 100644
--- a/l10n/th_TH/bookmarks.po
+++ b/l10n/th_TH/bookmarks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:16+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,42 +20,42 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "รายการโปรด"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "ยังไม่มีชื่อ"
 
 #: templates/bookmarklet.php:5
 msgid ""
 "Drag this to your browser bookmarks and click it, when you want to bookmark "
 "a webpage quickly:"
-msgstr ""
+msgstr "ลากสิ่งนี้ไปไว้ที่รายการโปรดในโปรแกรมบราวเซอร์ของคุณ แล้วคลิกที่นั่น, เมื่อคุณต้องการเก็บหน้าเว็บเพจเข้าไปไว้ในรายการโปรดอย่างรวดเร็ว"
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "อ่านภายหลัง"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "ที่อยู่"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "ชื่อ"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "ป้ายกำกับ"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "บันทึกรายการโปรด"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "คุณยังไม่มีรายการโปรด"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Bookmarklet <br />"
diff --git a/l10n/th_TH/calendar.po b/l10n/th_TH/calendar.po
index 85bdc87fc03..db695db5dca 100644
--- a/l10n/th_TH/calendar.po
+++ b/l10n/th_TH/calendar.po
@@ -9,21 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:30+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr "ไม่ใช่ปฏิทินทั้งหมดที่จะถูกจัดเก็บข้อมูลไว้ในหน่วยความจำแคชอย่างสมบูรณ์"
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr "ทุกสิ่งทุกอย่างได้ถูกเก็บเข้าไปไว้ในหน่วยความจำแคชอย่างสมบูรณ์แล้ว"
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "ไม่พบปฏิทินที่ต้องการ"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "ไม่พบกิจกรรมที่ต้องการ"
 
@@ -31,300 +39,394 @@ msgstr "ไม่พบกิจกรรมที่ต้องการ"
 msgid "Wrong calendar"
 msgstr "ปฏิทินไม่ถูกต้อง"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr "ไฟล์ดังกล่าวบรรจุข้อมูลกิจกรรมที่มีอยู่แล้วในปฏิทินของคุณ"
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr "กิจกรรมได้ถูกบันทึกไปไว้ในปฏิทินที่สร้างขึ้นใหม่แล้ว"
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "การนำเข้าข้อมูลล้มเหลว"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "กิจกรรมได้ถูกบันทึกเข้าไปไว้ในปฏิทินของคุณแล้ว"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "สร้างโซนเวลาใหม่:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "โซนเวลาถูกเปลี่ยนแล้ว"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "คำร้องขอไม่ถูกต้อง"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "ปฏิทิน"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "วันเกิด"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "ธุรกิจ"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "โทรติดต่อ"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "ลูกค้า"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "จัดส่ง"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "วันหยุด"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "ไอเดีย"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "การเดินทาง"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "งานเลี้ยง"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "นัดประชุม"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "อื่นๆ"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "ส่วนตัว"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "โครงการ"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "คำถาม"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "งาน"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr "โดย"
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "ไม่มีชื่อ"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "สร้างปฏิทินใหม่"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "ไม่ต้องทำซ้ำ"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "รายวัน"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "รายสัปดาห์"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "ทุกวันหยุด"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "รายปักษ์"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "รายเดือน"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "รายปี"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "ไม่ต้องเลย"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "ตามจำนวนที่ปรากฏ"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "ตามวันที่"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "จากเดือน"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "จากสัปดาห์"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "วันจันทร์"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "วันอังคาร"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "วันพุธ"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "วันพฤหัสบดี"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "วันศุกร์"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "วันเสาร์"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "วันอาทิตย์"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "สัปดาห์ที่มีกิจกรรมของเดือน"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "ลำดับแรก"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "ลำดับที่สอง"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "ลำดับที่สาม"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "ลำดับที่สี่"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "ลำดับที่ห้า"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "ลำดับสุดท้าย"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "มกราคม"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "กุมภาพันธ์"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "มีนาคม"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "เมษายน"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "พฤษภาคม"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "มิถุนายน"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "กรกฏาคม"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "สิงหาคม"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "กันยายน"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "ตุลาคม"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "พฤศจิกายน"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "ธันวาคม"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "ตามวันที่จัดกิจกรรม"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "ของเมื่อวานนี้"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "จากหมายเลขของสัปดาห์"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "ตามวันและเดือน"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "วันที่"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "คำนวณ"
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "อา."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "จ."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "อ."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "พ."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "พฤ."
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "ศ."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "ส."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "ม.ค."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "ก.พ."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "มี.ค."
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "เม.ย."
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "พ.ค."
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "มิ.ย."
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "ก.ค."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "ส.ค."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "ก.ย."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "ต.ค."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "พ.ย."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "ธ.ค."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "ทั้งวัน"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "สร้างปฏิทินใหม่"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "ช่องฟิลด์เกิดการสูญหาย"
@@ -358,40 +460,32 @@ msgstr "วันที่สิ้นสุดกิจกรรมดังก
 msgid "There was a database fail"
 msgstr "เกิดความล้มเหลวกับฐานข้อมูล"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "สัปดาห์"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "เดือน"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "รายการ"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "วันนี้"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "ปฏิทิน"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "เกิดความล้มเหลวในการแยกไฟล์"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "เลือกปฏิทินที่ต้องการใช้งาน"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr "ตั้งค่า"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "ปฏิทินของคุณ"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "ลิงค์ CalDav"
 
@@ -403,19 +497,19 @@ msgstr "ปฏิทินที่เปิดแชร์"
 msgid "No shared calendars"
 msgstr "ไม่มีปฏิทินที่เปิดแชร์ไว้"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "เปิดแชร์ปฏิทิน"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "แก้ไข"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "ลบ"
@@ -501,23 +595,23 @@ msgstr "คั่นระหว่างรายการหมวดหมู
 msgid "Edit categories"
 msgstr "แก้ไขหมวดหมู่"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "เป็นกิจกรรมตลอดทั้งวัน"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "จาก"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "ถึง"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "ตัวเลือกขั้นสูง"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "สถานที่"
 
@@ -525,7 +619,7 @@ msgstr "สถานที่"
 msgid "Location of the Event"
 msgstr "สถานที่จัดกิจกรรม"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "คำอธิบาย"
 
@@ -533,84 +627,86 @@ msgstr "คำอธิบาย"
 msgid "Description of the Event"
 msgstr "คำอธิบายเกี่ยวกับกิจกรรม"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "ทำซ้ำ"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "ขั้นสูง"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "เลือกสัปดาห์"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "เลือกวัน"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "และวันที่มีเหตุการณ์เกิดขึ้นในปี"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "และวันที่มีเหตุการณ์เกิดขึ้นในเดือน"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "เลือกเดือน"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "เลือกสัปดาห์"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "และสัปดาห์ที่มีเหตุการณ์เกิดขึ้นในปี"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "ช่วงเวลา"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "สิ้นสุด"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "จำนวนที่ปรากฏ"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "สร้างปฏิทินใหม่"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "นำเข้าไฟล์ปฏิทิน"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "กรณาเลือกปฏิทิน"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "สร้างปฏิทินใหม่"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "กรุณาเลือกปฏิทิน"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "ชื่อของปฏิทิน"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "นำเข้าข้อมูล"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr "เลือกชื่อที่ต้องการ"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "นำเข้าข้อมูลปฏิทิน"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr "ปฏิทินชื่อดังกล่าวถูกใช้งานไปแล้ว หากคุณยังดำเนินการต่อไป ปฏิทินดังกล่าวนี้จะถูกผสานข้อมูลเข้าด้วยกัน"
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "ปฏิทินถูกนำเข้าข้อมูลเรียบร้อยแล้ว"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "นำเข้าข้อมูล"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "ปิดกล่องข้อความโต้ตอบ"
 
@@ -626,45 +722,73 @@ msgstr "ดูกิจกรรม"
 msgid "No categories selected"
 msgstr "ยังไม่ได้เลือกหมวดหมู่"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "เลือกหมวดหมู่"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "ของ"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "ที่"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr "ทั่วไป"
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "โซนเวลา"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "ตรวจสอบการเปลี่ยนแปลงโซนเวลาอยู่เสมอ"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr "อัพเดทโซนเวลาอัตโนมัติ"
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "รูปแบบการแสดงเวลา"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr "รูปแบบเวลา"
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24 ช.ม."
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12 ช.ม."
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "วันแรกของสัปดาห์"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr "เริ่มต้นสัปดาห์ด้วย"
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr "หน่วยความจำแคช"
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr "ล้างข้อมูลในหน่วยความจำแคชสำหรับกิจกรรมที่ซ้ำซ้อน"
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr "URLs"
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr "ที่อยู่ที่ใช้สำหรับเชื่อมข้อมูลปฏิทิน CalDAV"
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr "ข้อมูลเพิ่มเติม"
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr "ที่อยู่หลัก (Kontact et al)"
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "ที่อยู่ในการเชื่อมข้อมูลกับปฏิทิน CalDav:"
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr "อ่านเฉพาะลิงก์ iCalendar เท่านั้น"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
index b89d76eeecc..88f3f467d4b 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 14:39+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr "เกิดข้อผิดพลาดใน (ยกเลิก)การเปิดใช้งานสมุดบันทึกที่อยู่"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "ยังไม่ได้กำหนดรหัส"
 
@@ -61,13 +61,13 @@ msgstr "ไม่พบข้อมูลการติดต่อที่ต
 msgid "There was an error adding the contact."
 msgstr "เกิดข้อผิดพลาดในการเพิ่มรายชื่อผู้ติดต่อใหม่"
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "ยังไม่ได้กำหนดชื่อ"
 
 #: ajax/contact/addproperty.php:46
 msgid "Could not parse contact: "
-msgstr ""
+msgstr "ไม่สามารถแจกแจงรายชื่อผู้ติดต่อได้"
 
 #: ajax/contact/addproperty.php:56
 msgid "Cannot add empty property."
@@ -83,13 +83,13 @@ msgstr "พยายามที่จะเพิ่มทรัพยากร
 
 #: ajax/contact/addproperty.php:144
 msgid "Error adding contact property: "
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการเพิ่มคุณสมบัติข้อมูลผู้ติดต่อ"
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "ข้อมูลเกี่ยวกับ vCard ไม่ถูกต้อง กรุณาโหลดหน้าเวปใหม่อีกครั้ง"
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "เกิดข้อผิดพลาดในการลบรายละเอียดการติดต่อ"
 
@@ -101,19 +101,19 @@ msgstr "รหัสสูญหาย"
 msgid "Error parsing VCard for ID: \""
 msgstr "พบข้อผิดพลาดในการแยกรหัส VCard:\""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "ยังไม่ได้กำหนดค่า checksum"
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "ข้อมูล vCard ไม่ถูกต้อง กรุณาโหลดหน้าเว็บใหม่อีกครั้ง: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "มีบางอย่างเกิดการ FUBAR. "
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "เกิดข้อผิดพลาดในการอัพเดทข้อมูลการติดต่อ"
 
@@ -162,19 +162,19 @@ msgstr "เกิดข้อผิดพลาดในการดึงคุ
 msgid "Error saving contact."
 msgstr "เกิดข้อผิดพลาดในการบันทึกข้อมูลผู้ติดต่อ"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "เกิดข้อผิดพลาดในการปรับขนาดรูปภาพ"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "เกิดข้อผิดพลาดในการครอบตัดภาพ"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "เกิดข้อผิดพลาดในการสร้างรูปภาพชั่วคราว"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "เกิดข้อผิดพลาดในการค้นหารูปภาพ: "
 
@@ -274,6 +274,10 @@ msgid ""
 "on this server."
 msgstr "ไฟล์ที่คุณกำลังพยายามที่จะอัพโหลดมีขนาดเกินจำนวนสูงสุดที่สามารถอัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr "เกิดข้อผิดพลาดในการโหลดรูปภาพประจำตัว"
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "เลือกชนิด"
@@ -282,7 +286,7 @@ msgstr "เลือกชนิด"
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
-msgstr ""
+msgstr "ข้อมูลผู้ติดต่อบางรายการได้ถูกทำเครื่องหมายสำหรับลบทิ้งเอาไว้, แต่ยังไม่ได้ถูกลบทิ้ง, กรุณารอให้รายการดังกล่าวถูกลบทิ้งเสียก่อน"
 
 #: js/loader.js:49
 msgid "Result: "
@@ -298,11 +302,11 @@ msgstr " ล้มเหลว."
 
 #: js/settings.js:67
 msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "ชื่อที่ใช้แสดงไม่สามารถเว้นว่างได้"
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ"
 
 #: lib/app.php:49
 msgid "This is not your addressbook."
@@ -376,55 +380,55 @@ msgstr "วันเกิด"
 
 #: lib/app.php:184
 msgid "Business"
-msgstr ""
+msgstr "ธุรกิจ"
 
 #: lib/app.php:185
 msgid "Call"
-msgstr ""
+msgstr "โทร"
 
 #: lib/app.php:186
 msgid "Clients"
-msgstr ""
+msgstr "ลูกค้า"
 
 #: lib/app.php:187
 msgid "Deliverer"
-msgstr ""
+msgstr "ผู้จัดส่ง"
 
 #: lib/app.php:188
 msgid "Holidays"
-msgstr ""
+msgstr "วันหยุด"
 
 #: lib/app.php:189
 msgid "Ideas"
-msgstr ""
+msgstr "ไอเดีย"
 
 #: lib/app.php:190
 msgid "Journey"
-msgstr ""
+msgstr "การเดินทาง"
 
 #: lib/app.php:191
 msgid "Jubilee"
-msgstr ""
+msgstr "งานเฉลิมฉลอง"
 
 #: lib/app.php:192
 msgid "Meeting"
-msgstr ""
+msgstr "ประชุม"
 
 #: lib/app.php:193
 msgid "Other"
-msgstr ""
+msgstr "อื่นๆ"
 
 #: lib/app.php:194
 msgid "Personal"
-msgstr ""
+msgstr "ส่วนตัว"
 
 #: lib/app.php:195
 msgid "Projects"
-msgstr ""
+msgstr "โปรเจค"
 
 #: lib/app.php:196
 msgid "Questions"
-msgstr ""
+msgstr "คำถาม"
 
 #: lib/hooks.php:102
 msgid "{name}'s Birthday"
@@ -444,7 +448,7 @@ msgstr "นำเข้า"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "ตั้งค่า"
 
 #: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
@@ -456,51 +460,51 @@ msgstr "ปิด"
 
 #: templates/index.php:37
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "ปุ่มลัด"
 
 #: templates/index.php:39
 msgid "Navigation"
-msgstr ""
+msgstr "ระบบเมนู"
 
 #: templates/index.php:42
 msgid "Next contact in list"
-msgstr ""
+msgstr "ข้อมูลผู้ติดต่อถัดไปในรายการ"
 
 #: templates/index.php:44
 msgid "Previous contact in list"
-msgstr ""
+msgstr "ข้อมูลผู้ติดต่อก่อนหน้าในรายการ"
 
 #: templates/index.php:46
 msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "ขยาย/ย่อ สมุดบันทึกที่อยู่ปัจจุบัน"
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "สมุดบันทึกที่อยู่ถัดไป"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "สมุดบันทึกที่อยู่ก่อนหน้า"
 
 #: templates/index.php:54
 msgid "Actions"
-msgstr ""
+msgstr "การกระทำ"
 
 #: templates/index.php:57
 msgid "Refresh contacts list"
-msgstr ""
+msgstr "รีเฟรชรายชื่อผู้ติดต่อใหม่"
 
 #: templates/index.php:59
 msgid "Add new contact"
-msgstr ""
+msgstr "เพิ่มข้อมูลผู้ติดต่อใหม่"
 
 #: templates/index.php:61
 msgid "Add new addressbook"
-msgstr ""
+msgstr "เพิ่มสมุดบันทึกที่อยู่ใหม่"
 
 #: templates/index.php:63
 msgid "Delete current contact"
-msgstr ""
+msgstr "ลบข้อมูลผู้ติดต่อปัจจุบัน"
 
 #: templates/part.contact.php:17
 msgid "Drop photo to upload"
@@ -532,7 +536,7 @@ msgstr "แก้ไขรายละเอียดของชื่อ"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "ลบ"
 
@@ -546,15 +550,15 @@ msgstr "กรอกชื่อเล่น"
 
 #: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
-msgstr ""
+msgstr "เว็บไซต์"
 
 #: templates/part.contact.php:44
 msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.somesite.com"
 
 #: templates/part.contact.php:44
 msgid "Go to web site"
-msgstr ""
+msgstr "ไปที่เว็บไซต์"
 
 #: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
@@ -651,11 +655,11 @@ msgstr "ตู้ ปณ."
 
 #: templates/part.edit_address_dialog.php:24
 msgid "Street address"
-msgstr ""
+msgstr "ที่อยู่"
 
 #: templates/part.edit_address_dialog.php:27
 msgid "Street and number"
-msgstr ""
+msgstr "ถนนและหมายเลข"
 
 #: templates/part.edit_address_dialog.php:30
 msgid "Extended"
@@ -663,7 +667,7 @@ msgstr "เพิ่ม"
 
 #: templates/part.edit_address_dialog.php:33
 msgid "Apartment number etc."
-msgstr ""
+msgstr "หมายเลขอพาร์ทเมนต์ ฯลฯ"
 
 #: templates/part.edit_address_dialog.php:36
 #: templates/part.edit_address_dialog.php:39
@@ -676,7 +680,7 @@ msgstr "ภูมิภาค"
 
 #: templates/part.edit_address_dialog.php:45
 msgid "E.g. state or province"
-msgstr ""
+msgstr "เช่น รัฐ หรือ จังหวัด"
 
 #: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
@@ -684,7 +688,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
@@ -805,15 +809,15 @@ msgstr "กำหนดค่าสมุดบันทึกที่อยู
 
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
-msgstr ""
+msgstr "เลือกสมุดบันทึกที่อยู่"
 
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
 msgid "Enter name"
-msgstr ""
+msgstr "กรอกชื่อ"
 
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
 msgid "Enter description"
-msgstr ""
+msgstr "กรอกคำอธิบาย"
 
 #: templates/settings.php:3
 msgid "CardDAV syncing addresses"
@@ -833,40 +837,40 @@ msgstr "iOS/OS X"
 
 #: templates/settings.php:20
 msgid "Show CardDav link"
-msgstr ""
+msgstr "แสดงลิงก์ CardDav"
 
 #: templates/settings.php:23
 msgid "Show read-only VCF link"
-msgstr ""
+msgstr "แสดงลิงก์ VCF สำหรับอ่านเท่านั้น"
 
 #: templates/settings.php:26
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "แก้ไข"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
-msgstr ""
+msgstr "ชื่อ"
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
-msgstr ""
+msgstr "คำอธิบาย"
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "บันทึก"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
-msgstr ""
+msgstr "เพิ่มเติม..."
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index f1966051f32..c5a8f013b6d 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 12:47+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +55,7 @@ msgstr "ไฟล์"
 
 #: js/fileactions.js:95
 msgid "Unshare"
-msgstr ""
+msgstr "ยกเลิกการแชร์ข้อมูล"
 
 #: js/fileactions.js:97 templates/index.php:56
 msgid "Delete"
@@ -63,31 +63,31 @@ msgstr "ลบ"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "มีอยู่แล้ว"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "แทนที่"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "ยกเลิก"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "แทนที่แล้ว"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "กับ"
 
 #: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
-msgstr ""
+msgstr "เลิกทำ"
 
 #: js/filelist.js:256
 msgid "deleted"
-msgstr ""
+msgstr "ลบแล้ว"
 
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
@@ -113,27 +113,27 @@ msgstr "การอัพโหลดถูกยกเลิก"
 msgid "Invalid name, '/' is not allowed."
 msgstr "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม่อนุญาตให้ใช้งาน"
 
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:694 templates/index.php:55
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:695 templates/index.php:56
 msgid "Modified"
 msgstr "ปรับปรุงล่าสุด"
 
-#: js/files.js:659
+#: js/files.js:722
 msgid "folder"
 msgstr "โฟลเดอร์"
 
-#: js/files.js:661
+#: js/files.js:724
 msgid "folders"
 msgstr "โฟลเดอร์"
 
-#: js/files.js:669
+#: js/files.js:732
 msgid "file"
 msgstr "ไฟล์"
 
-#: js/files.js:671
+#: js/files.js:734
 msgid "files"
 msgstr "ไฟล์"
 
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
new file mode 100644
index 00000000000..f396eed4dab
--- /dev/null
+++ b/l10n/th_TH/files_encryption.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:12+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr "การเข้ารหัส"
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr "ไม่ต้องรวมชนิดของไฟล์ดังต่อไปนี้จากการเข้ารหัส"
+
+#: templates/settings.php:5
+msgid "None"
+msgstr "ไม่ต้อง"
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr "เปิดใช้งานการเข้ารหัส"
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
new file mode 100644
index 00000000000..2ba0dcb2652
--- /dev/null
+++ b/l10n/th_TH/files_external.po
@@ -0,0 +1,83 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:35+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr "พื้นทีจัดเก็บข้อมูลจากภายนอก"
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr "จุดชี้ตำแหน่ง"
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr "ด้านหลังระบบ"
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr "การกำหนดค่า"
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr "ตัวเลือก"
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr "สามารถใช้งานได้"
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr "เพิ่มจุดชี้ตำแหน่ง"
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr "ยังไม่มีการกำหนด"
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr "ผู้ใช้งานทั้งหมด"
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr "กลุ่ม"
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr "ผู้ใช้งาน"
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr "ลบ"
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root"
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root"
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr "เปิดให้มีการใช้พื้นที่จัดเก็บข้อมูลของผู้ใช้งานจากภายนอกได้"
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr "อนุญาตให้ผู้ใช้งานสามารถชี้ตำแหน่งไปที่พื้นที่จัดเก็บข้อมูลภายนอกของตนเองได้"
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
new file mode 100644
index 00000000000..250856835fc
--- /dev/null
+++ b/l10n/th_TH/files_sharing.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:14+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr "ไฟล์ของคุณที่แชร์ไว้"
+
+#: templates/list.php:6
+msgid "Item"
+msgstr "ไอเท็ม"
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr "แชร์พร้อมกับ"
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr "สิทธิ์การเข้าใช้งาน"
+
+#: templates/list.php:16
+msgid "Read"
+msgstr "อ่าน"
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr "แก้ไข"
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr "ลบ"
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr "เปิดให้มีการแชร์ใหม่อีกครั้งได้"
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr "อนุญาตให้ผู้ใช้งานสามารถแชร์ไฟล์ที่ไม่ได้เป็นเจ้าของใหม่ได้"
diff --git a/l10n/th_TH/files_versions.po b/l10n/th_TH/files_versions.po
new file mode 100644
index 00000000000..4bab33ad9f7
--- /dev/null
+++ b/l10n/th_TH/files_versions.po
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:11+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr "หมดอายุทุกรุ่น"
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr "เปิดใช้งานคุณสมบัติการแยกสถานะรุ่นหรือเวอร์ชั่นของไฟล์"
diff --git a/l10n/th_TH/gallery.po b/l10n/th_TH/gallery.po
index 1a8ef7a619a..d442789187d 100644
--- a/l10n/th_TH/gallery.po
+++ b/l10n/th_TH/gallery.po
@@ -9,88 +9,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 12:50+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:39
 msgid "Pictures"
 msgstr "รูปภาพ"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "แชร์ข้อมูลแกลอรี่"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "พบข้อผิดพลาด: "
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
-
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "ตั้งค่า"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "ตรวจสอบอีกครั้ง"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "หยุด"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "แชร์"
-
-#: templates/view_album.php:19
-msgid "Back"
-msgstr "ย้อนกลับ"
-
-#: templates/view_album.php:36
-msgid "Remove confirmation"
-msgstr "การยืนยันการลบ"
-
-#: templates/view_album.php:37
-msgid "Do you want to remove album"
-msgstr "คุณต้องการลบอัลบั้มออกหรือไม่"
-
-#: templates/view_album.php:40
-msgid "Change album name"
-msgstr "เปลี่ยนชื่ออัลบั้ม"
+msgstr "เกิดข้อผิดพลาดภายในระบบ"
 
-#: templates/view_album.php:43
-msgid "New album name"
-msgstr "ชื่อใหม่ของอัลบั้ม"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "ภาพสไลด์โชว์"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index 2a9f5b46d5f..57847a06f6d 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:40+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,96 +18,96 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
-msgstr ""
+msgstr "ช่วยเหลือ"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
-msgstr ""
+msgstr "ส่วนตัว"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
-msgstr ""
+msgstr "ตั้งค่า"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
-msgstr ""
+msgstr "ผู้ใช้งาน"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
-msgstr ""
+msgstr "แอปฯ"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
-msgstr ""
+msgstr "ผู้ดูแล"
 
 #: files.php:245
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "คุณสมบัติการดาวน์โหลด zip ถูกปิดการใช้งานไว้"
 
 #: files.php:246
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น"
 
 #: files.php:246 files.php:271
 msgid "Back to Files"
-msgstr ""
+msgstr "กลับไปที่ไฟล์"
 
 #: files.php:270
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "ไฟล์ที่เลือกมีขนาดใหญ่เกินกว่าที่จะสร้างเป็นไฟล์ zip"
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "แอพพลิเคชั่นดังกล่าวยังไม่ได้เปิดใช้งาน"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "รหัสยืนยันความถูกต้องหมดอายุแล้ว กรุณาโหลดหน้าเว็บใหม่อีกครั้ง"
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "วินาทีที่ผ่านมา"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 นาทีมาแล้ว"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d นาทีที่ผ่านมา"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "วันนี้"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "เมื่อวานนี้"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d วันที่ผ่านมา"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "เดือนที่แล้ว"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "เดือนมาแล้ว"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "ปีที่แล้ว"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "ปีที่ผ่านมา"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 3adfedcdeb0..0dc69f7f225 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 12:49+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "ไม่สามารถโหลดรายการจาก App Store ได้"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -42,7 +42,7 @@ msgstr "คำร้องขอไม่ถูกต้อง"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -50,7 +50,7 @@ msgstr "เปลี่ยนภาษาเรียบร้อยแล้ว
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "ข้อผิดพลาด"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -70,13 +70,29 @@ msgstr "ภาษาไทย"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "คำเตือนเกี่ยวกับความปลอดภัย"
+
+#: templates/admin.php:29
+msgid "Cron"
+msgstr "Cron"
 
-#: templates/admin.php:28
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr "ประมวลผลหนึ่งงานเมื่อโหลดหน้าเว็บแต่ละครั้ง"
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr "cron.php ได้ถูกลงทะเบียนที่บริการ webcron"
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr "ใช้บริการ cron จากระบบ"
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "บันทึกการเปลี่ยนแปลง"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "เพิ่มเติม"
 
@@ -214,7 +230,7 @@ msgstr "อื่นๆ"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
-msgstr ""
+msgstr "ผู้ดูแลย่อย"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/th_TH/tasks.po b/l10n/th_TH/tasks.po
new file mode 100644
index 00000000000..7d450237645
--- /dev/null
+++ b/l10n/th_TH/tasks.po
@@ -0,0 +1,107 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 15:26+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr "วันที่ / เวลา ไม่ถูกต้อง"
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr "งาน"
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr "ไม่มีหมวดหมู่"
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr "ยังไม่ได้ระบุ"
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr "1=สูงสุด"
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr "5=ปานกลาง"
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr "9=ต่ำสุด"
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr "ข้อมูลสรุปยังว่างอยู่"
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr "สัดส่วนเปอร์เซ็นต์ความสมบูรณ์ไม่ถูกต้อง"
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr "ความสำคัญไม่ถูกต้อง"
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr "เพิ่มงานใหม่"
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr "จัดเรียงตามกำหนดเวลา"
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr "จัดเรียงตามรายชื่อ"
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr "จัดเรียงตามความสมบูรณ์"
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr "จัดเรียงตามตำแหน่งที่อยู่"
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr "จัดเรียงตามระดับความสำคัญ"
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr "จัดเรียงตามป้ายชื่อ"
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr "กำลังโหลดข้อมูลงาน..."
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr "สำคัญ"
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr "มาก"
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr "น้อย"
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr "ลบ"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
new file mode 100644
index 00000000000..1f8d946d7ad
--- /dev/null
+++ b/l10n/th_TH/user_ldap.po
@@ -0,0 +1,165 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 15:30+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr "โฮสต์"
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr "รหัสผ่าน"
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr "ตัวกรองข้อมูลกลุ่ม"
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr "พอร์ต"
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr "ใช้ TLS"
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น"
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr "ในหน่วยไบต์"
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr "ช่วยเหลือ"
diff --git a/l10n/th_TH/user_migrate.po b/l10n/th_TH/user_migrate.po
new file mode 100644
index 00000000000..74a5aec4843
--- /dev/null
+++ b/l10n/th_TH/user_migrate.po
@@ -0,0 +1,52 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:37+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr "ส่งออก"
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr "เกิดข้อผิดพลาดบางประการในระหว่างการส่งออกไฟล์"
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr "เกิดข้อผิดพลาดบางประการ"
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr "ส่งออกบัญชีผู้ใช้งานของคุณ"
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr "ส่วนนี้จะเป็นการสร้างไฟล์บีบอัดที่บรรจุข้อมูลบัญชีผู้ใช้งาน ownCloud ของคุณ"
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr "นำเข้าบัญชีผู้ใช้งาน"
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr "ไฟล์ Zip ผู้ใช้งาน ownCloud"
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr "นำเข้า"
diff --git a/l10n/th_TH/user_openid.po b/l10n/th_TH/user_openid.po
new file mode 100644
index 00000000000..7ed74e306ba
--- /dev/null
+++ b/l10n/th_TH/user_openid.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:32+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th_TH\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr "นี่คือปลายทางของเซิร์ฟเวอร์ OpenID สำหรับรายละเอียดเพิ่มเติม, กรุณาดูที่"
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr "ข้อมูลประจำตัว <b>"
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr "ขอบเขตพื้นที่ <b>"
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr "ผู้ใช้งาน: <b>"
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr "เข้าสู่ระบบ"
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr "พบข้อผิดพลาด <b> ยังไม่ได้เลือกชื่อผู้ใช้งาน"
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr "คุณสามารถได้รับสิทธิ์เพื่อเข้าใช้งานเว็บไซต์อื่นๆโดยใช้ที่อยู่นี้"
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr "ผู้ให้บริการ OpenID ที่ได้รับอนุญาต"
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr "ที่อยู่ของคุณที่ Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/tr/admin_dependencies_chk.po b/l10n/tr/admin_dependencies_chk.po
new file mode 100644
index 00000000000..7a089c19af6
--- /dev/null
+++ b/l10n/tr/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/tr/admin_migrate.po b/l10n/tr/admin_migrate.po
new file mode 100644
index 00000000000..ab3ee34d97f
--- /dev/null
+++ b/l10n/tr/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/tr/calendar.po b/l10n/tr/calendar.po
index 90156adadf0..0e49a201841 100644
--- a/l10n/tr/calendar.po
+++ b/l10n/tr/calendar.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 06:05+0000\n"
-"Last-Translator: mesutgungor <mesutgungor@iyte.edu.tr>\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "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"
@@ -74,31 +74,30 @@ msgstr "Geçersiz istek"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Takvim"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "AAA g[ yyyy]{ '&#8212;'[ AAA] g yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr "dddd, MMM d, yyyy"
 
@@ -223,7 +222,7 @@ msgstr "ay günlerine göre"
 msgid "by weekday"
 msgstr "hafta günlerine göre"
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Pazartesi"
 
@@ -247,7 +246,7 @@ msgstr "Cuma"
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Pazar"
 
@@ -464,33 +463,25 @@ msgstr "Olay başlamadan önce bitiyor"
 msgid "There was a database fail"
 msgstr "Bir veritabanı başarısızlığı oluştu"
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Hafta"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Ay"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Bugün"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Takvimler"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Dosya okunurken başarısızlık oldu."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Aktif takvimleri seçin"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -742,55 +733,63 @@ msgstr "nın"
 msgid "at"
 msgstr "üzerinde"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Zaman dilimi"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Sürekli zaman dilimi değişikliklerini kontrol et"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Saat biçimi"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24s"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12s"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "Haftanın ilk günü"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr "Önbellek"
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr "Tekrar eden etkinlikler için ön belleği temizle."
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr "CalDAV takvimi adresleri senkronize ediyor."
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr "daha fazla bilgi"
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr "Öncelikli adres"
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr "Sadece okunabilir iCalendar link(ler)i"
 
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index e2f07fe95d0..79c0485eddc 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "Adres defteri etkisizleştirilirken hata oluştu."
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id atanmamış."
 
@@ -62,7 +62,7 @@ msgstr "Bağlantı bulunamadı."
 msgid "There was an error adding the contact."
 msgstr "Kişi eklenirken hata oluştu."
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "eleman ismi atanmamış."
 
@@ -86,11 +86,11 @@ msgstr "Yinelenen özellik eklenmeye çalışılıyor: "
 msgid "Error adding contact property: "
 msgstr "Kişi özelliği eklenirken hata oluştu."
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin."
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "Kişi özelliği silinirken hata oluştu."
 
@@ -102,19 +102,19 @@ msgstr "Eksik ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "ID için VCard ayrıştırılamadı:\""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "checksum atanmamış."
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "Bir şey FUBAR gitti."
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "Kişi özelliği güncellenirken hata oluştu."
 
@@ -163,19 +163,19 @@ msgstr "Resim özelleğini alırken hata oluştu."
 msgid "Error saving contact."
 msgstr "Bağlantıyı kaydederken hata"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "Görüntü yeniden boyutlandırılamadı."
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "Görüntü kırpılamadı."
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "Geçici resim oluştururken hata oluştu"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "Resim ararken hata oluştu:"
 
@@ -275,6 +275,10 @@ msgid ""
 "on this server."
 msgstr "Yüklemeye çalıştığınız dosya sunucudaki dosya yükleme maksimum boyutunu aşmaktadır. "
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "Tür seç"
@@ -533,7 +537,7 @@ msgstr "İsim detaylarını düzenle"
 
 #: 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
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Sil"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "İndir"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Düzenle"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Yeni Adres Defteri"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Kaydet"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "İptal"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
new file mode 100644
index 00000000000..af47564a459
--- /dev/null
+++ b/l10n/tr/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
new file mode 100644
index 00000000000..f72e8d229bc
--- /dev/null
+++ b/l10n/tr/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
new file mode 100644
index 00000000000..47f149e2b3d
--- /dev/null
+++ b/l10n/tr/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/tr/files_versions.po b/l10n/tr/files_versions.po
new file mode 100644
index 00000000000..5b163028452
--- /dev/null
+++ b/l10n/tr/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 11c40ff6af8..1ea3973f522 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -72,11 +72,27 @@ msgstr "__dil_adı__"
 msgid "Security Warning"
 msgstr "Güvenlik Uyarisi"
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Günlük"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "Devamı"
 
diff --git a/l10n/tr/tasks.po b/l10n/tr/tasks.po
new file mode 100644
index 00000000000..68549f8375b
--- /dev/null
+++ b/l10n/tr/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
new file mode 100644
index 00000000000..de0cb374c3d
--- /dev/null
+++ b/l10n/tr/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/tr/user_migrate.po b/l10n/tr/user_migrate.po
new file mode 100644
index 00000000000..5b31904b2f3
--- /dev/null
+++ b/l10n/tr/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/tr/user_openid.po b/l10n/tr/user_openid.po
new file mode 100644
index 00000000000..6c6f6b5ed5f
--- /dev/null
+++ b/l10n/tr/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/uk/admin_dependencies_chk.po b/l10n/uk/admin_dependencies_chk.po
new file mode 100644
index 00000000000..5fae31131d7
--- /dev/null
+++ b/l10n/uk/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/uk/admin_migrate.po b/l10n/uk/admin_migrate.po
new file mode 100644
index 00000000000..b0ba19c7eb9
--- /dev/null
+++ b/l10n/uk/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/uk/calendar.po b/l10n/uk/calendar.po
index f2eab41a95b..a80f3c9db3e 100644
--- a/l10n/uk/calendar.po
+++ b/l10n/uk/calendar.po
@@ -8,21 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr ""
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr ""
 
@@ -30,303 +38,397 @@ msgstr ""
 msgid "Wrong calendar"
 msgstr ""
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Новий часовий пояс"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Часовий пояс змінено"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Календар"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr ""
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "День народження"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Справи"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Подзвонити"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Клієнти"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Свята"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Ідеї"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Поїздка"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Ювілей"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Зустріч"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Інше"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Особисте"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Проекти"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Запитання"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Робота"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "новий Календар"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Не повторювати"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Щоденно"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Щотижня"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "По будням"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Кожні дві неділі"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Щомісяця"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Щорічно"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "ніколи"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr ""
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr ""
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Понеділок"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Вівторок"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Середа"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Четвер"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "П'ятниця"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Субота"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Неділя"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "перший"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "другий"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "третій"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "четвертий"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "п'ятий"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "останній"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Січень"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Лютий"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Березень"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Квітень"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Травень"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Червень"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Липень"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Серпень"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Вересень"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Жовтень"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Листопад"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Грудень"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Дата"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Кал."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Увесь день"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "новий Календар"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
-msgstr ""
+msgstr "Пропущені поля"
 
 #: templates/calendar.php:14 templates/part.eventform.php:19
 #: templates/part.showevent.php:11
@@ -335,62 +437,54 @@ msgstr "Назва"
 
 #: templates/calendar.php:16
 msgid "From Date"
-msgstr ""
+msgstr "Від Дати"
 
 #: templates/calendar.php:17
 msgid "From Time"
-msgstr ""
+msgstr "З Часу"
 
 #: templates/calendar.php:18
 msgid "To Date"
-msgstr ""
+msgstr "До Часу"
 
 #: templates/calendar.php:19
 msgid "To Time"
-msgstr ""
+msgstr "По Дату"
 
 #: templates/calendar.php:20
 msgid "The event ends before it starts"
-msgstr ""
+msgstr "Подія завершається до її початку"
 
 #: templates/calendar.php:21
 msgid "There was a database fail"
-msgstr ""
+msgstr "Сталася помилка бази даних"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Тиждень"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Місяць"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Список"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Сьогодні"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "Календарі"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "Сталася помилка при обробці файлу"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Вибрати активні календарі"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Ваші календарі"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr ""
 
@@ -402,22 +496,22 @@ msgstr ""
 msgid "No shared calendars"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr ""
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Редагувати"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Видалити"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
@@ -445,7 +539,7 @@ msgstr "Колір календаря"
 
 #: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "Зберегти"
 
 #: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
@@ -454,7 +548,7 @@ msgstr ""
 
 #: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr "Відмінити"
 
 #: templates/part.editevent.php:1
 msgid "Edit an event"
@@ -462,7 +556,7 @@ msgstr ""
 
 #: templates/part.editevent.php:10
 msgid "Export"
-msgstr ""
+msgstr "Експорт"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
@@ -500,23 +594,23 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr ""
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "З"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "По"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr ""
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Місце"
 
@@ -524,7 +618,7 @@ msgstr "Місце"
 msgid "Location of the Event"
 msgstr "Місце події"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Опис"
 
@@ -532,84 +626,86 @@ msgstr "Опис"
 msgid "Description of the Event"
 msgstr "Опис події"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Повторювати"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr ""
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr ""
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr ""
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr ""
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr ""
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr ""
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "створити новий календар"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Імпортувати файл календаря"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
 msgstr ""
 
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "створити новий календар"
-
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Назва нового календаря"
 
-#: templates/part.import.php:17
-msgid "Import"
+#: templates/part.import.php:44
+msgid "Take an available name!"
 msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Календар успішно імпортовано"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Імпорт"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr ""
 
@@ -625,49 +721,77 @@ msgstr ""
 msgid "No categories selected"
 msgstr ""
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr ""
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Часовий пояс"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
 msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "Формат часу"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24г"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12г"
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Адреса синхронізації календаря CalDAV:"
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
-msgstr ""
+msgstr "Користувачі"
 
 #: templates/share.dropdown.php:21
 msgid "select users"
@@ -679,7 +803,7 @@ msgstr ""
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Групи"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
diff --git a/l10n/uk/contacts.po b/l10n/uk/contacts.po
index 450539dd15f..3cb6c2aa249 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -60,7 +60,7 @@ msgstr ""
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -84,11 +84,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -100,19 +100,19 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,19 +161,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -531,7 +535,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Видалити"
 
@@ -842,30 +846,30 @@ msgstr ""
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "Нова адресна книга"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
new file mode 100644
index 00000000000..be6f1edb748
--- /dev/null
+++ b/l10n/uk/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
new file mode 100644
index 00000000000..4d2de48c58f
--- /dev/null
+++ b/l10n/uk/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
new file mode 100644
index 00000000000..bb60168265b
--- /dev/null
+++ b/l10n/uk/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/uk/files_versions.po b/l10n/uk/files_versions.po
new file mode 100644
index 00000000000..fdbf46f9cba
--- /dev/null
+++ b/l10n/uk/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 01069d3c253..e779674bc42 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -70,11 +70,27 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr ""
 
diff --git a/l10n/uk/tasks.po b/l10n/uk/tasks.po
new file mode 100644
index 00000000000..37254722c73
--- /dev/null
+++ b/l10n/uk/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
new file mode 100644
index 00000000000..236f6c2034a
--- /dev/null
+++ b/l10n/uk/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/uk/user_migrate.po b/l10n/uk/user_migrate.po
new file mode 100644
index 00000000000..816951cef34
--- /dev/null
+++ b/l10n/uk/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/uk/user_openid.po b/l10n/uk/user_openid.po
new file mode 100644
index 00000000000..699f470569b
--- /dev/null
+++ b/l10n/uk/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/vi/admin_dependencies_chk.po b/l10n/vi/admin_dependencies_chk.po
new file mode 100644
index 00000000000..9f7f77f611a
--- /dev/null
+++ b/l10n/vi/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/vi/admin_migrate.po b/l10n/vi/admin_migrate.po
new file mode 100644
index 00000000000..58d15a553c4
--- /dev/null
+++ b/l10n/vi/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/vi/calendar.po b/l10n/vi/calendar.po
index f0f4660844a..b08b6e2ae86 100644
--- a/l10n/vi/calendar.po
+++ b/l10n/vi/calendar.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-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -71,31 +71,30 @@ msgstr "Yêu cầu không hợp lệ"
 
 #: appinfo/app.php:35 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
-#: templates/settings.php:12
 msgid "Calendar"
 msgstr "Lịch"
 
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr "ddd M/d"
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr "dddd M/d"
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr "MMMM yyyy"
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr "dddd, MMM d, yyyy"
 
@@ -220,7 +219,7 @@ msgstr "bởi ngày trong tháng"
 msgid "by weekday"
 msgstr "bởi ngày trong tuần"
 
-#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "Thứ 2"
 
@@ -244,7 +243,7 @@ msgstr "Thứ "
 msgid "Saturday"
 msgstr "Thứ 7"
 
-#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "Chủ nhật"
 
@@ -461,33 +460,25 @@ msgstr "Sự kiện này kết thúc trước khi nó bắt đầu"
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:38
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "Tuần"
 
-#: templates/calendar.php:39
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "Tháng"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:41
 msgid "List"
 msgstr "Danh sách"
 
-#: templates/calendar.php:44
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "Hôm nay"
 
-#: templates/calendar.php:45
-msgid "Calendars"
-msgstr "Lịch"
-
-#: templates/calendar.php:59
-msgid "There was a fail, while parsing the file."
-msgstr "Có một thất bại, trong khi phân tích các tập tin."
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "Chọn lịch hoạt động"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -739,55 +730,63 @@ msgstr "của"
 msgid "at"
 msgstr "tại"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "Múi giờ"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "Luôn kiểm tra múi giờ"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
+#: templates/settings.php:52
+msgid "Time format"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24h"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12h"
 
-#: templates/settings.php:40
-msgid "First day of the week"
+#: templates/settings.php:64
+msgid "Start week on"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:76
 msgid "Cache"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:80
 msgid "Clear cache for repeating events"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:87
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:91
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:93
 msgid "Read only iCalendar link(s)"
 msgstr ""
 
diff --git a/l10n/vi/contacts.po b/l10n/vi/contacts.po
index 3e5a19915b5..3568844e5b6 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "Error (de)activating addressbook."
 msgstr ""
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "id không được thiết lập."
 
@@ -60,7 +60,7 @@ msgstr "Không tìm thấy danh sách"
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "tên phần tử không được thiết lập."
 
@@ -84,11 +84,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr ""
 
@@ -100,19 +100,19 @@ msgstr "Missing ID"
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr ""
 
@@ -161,19 +161,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -273,6 +273,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -531,7 +535,7 @@ msgstr ""
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "Xóa"
 
@@ -842,30 +846,30 @@ msgstr ""
 msgid "Download"
 msgstr "Tải về"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "Sửa"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "Lưu"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "Hủy"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
new file mode 100644
index 00000000000..d76c619333d
--- /dev/null
+++ b/l10n/vi/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
new file mode 100644
index 00000000000..8633bedfa5c
--- /dev/null
+++ b/l10n/vi/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
new file mode 100644
index 00000000000..4aa6347091a
--- /dev/null
+++ b/l10n/vi/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/vi/files_versions.po b/l10n/vi/files_versions.po
new file mode 100644
index 00000000000..2f97cd4aa3d
--- /dev/null
+++ b/l10n/vi/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index f23b9f3b387..3cf80bee1c5 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,27 @@ msgstr "__Ngôn ngữ___"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "nhiều hơn"
 
diff --git a/l10n/vi/tasks.po b/l10n/vi/tasks.po
new file mode 100644
index 00000000000..d22fa25d8ca
--- /dev/null
+++ b/l10n/vi/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
new file mode 100644
index 00000000000..52c6146db34
--- /dev/null
+++ b/l10n/vi/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/vi/user_migrate.po b/l10n/vi/user_migrate.po
new file mode 100644
index 00000000000..1e5615249f7
--- /dev/null
+++ b/l10n/vi/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/vi/user_openid.po b/l10n/vi/user_openid.po
new file mode 100644
index 00000000000..848cdb3cf4b
--- /dev/null
+++ b/l10n/vi/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/admin_dependencies_chk.po b/l10n/zh_CN.GB2312/admin_dependencies_chk.po
new file mode 100644
index 00000000000..b226f02b4ca
--- /dev/null
+++ b/l10n/zh_CN.GB2312/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/admin_migrate.po b/l10n/zh_CN.GB2312/admin_migrate.po
new file mode 100644
index 00000000000..f33396b69ec
--- /dev/null
+++ b/l10n/zh_CN.GB2312/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/bookmarks.po b/l10n/zh_CN.GB2312/bookmarks.po
new file mode 100644
index 00000000000..7bf81fd4608
--- /dev/null
+++ b/l10n/zh_CN.GB2312/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/calendar.po b/l10n/zh_CN.GB2312/calendar.po
new file mode 100644
index 00000000000..5e807e319ff
--- /dev/null
+++ b/l10n/zh_CN.GB2312/calendar.po
@@ -0,0 +1,814 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <bluehattree@126.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 14:53+0000\n"
+"Last-Translator: bluehattree <bluehattree@126.com>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
+msgid "No calendars found."
+msgstr ""
+
+#: ajax/categories/rescan.php:37
+msgid "No events found."
+msgstr ""
+
+#: ajax/event/edit.form.php:20
+msgid "Wrong calendar"
+msgstr "错误的日历"
+
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
+#: ajax/settings/guesstimezone.php:25
+msgid "New Timezone:"
+msgstr "新时区"
+
+#: ajax/settings/settimezone.php:23
+msgid "Timezone changed"
+msgstr "时区改变了"
+
+#: ajax/settings/settimezone.php:25
+msgid "Invalid request"
+msgstr "非法请求"
+
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
+msgid "Calendar"
+msgstr "日历"
+
+#: js/calendar.js:832
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:834
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:837
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:839
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr ""
+
+#: js/calendar.js:841
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:121
+msgid "Birthday"
+msgstr "生日"
+
+#: lib/app.php:122
+msgid "Business"
+msgstr "商务"
+
+#: lib/app.php:123
+msgid "Call"
+msgstr "呼叫"
+
+#: lib/app.php:124
+msgid "Clients"
+msgstr "客户端"
+
+#: lib/app.php:125
+msgid "Deliverer"
+msgstr "交付者"
+
+#: lib/app.php:126
+msgid "Holidays"
+msgstr "假期"
+
+#: lib/app.php:127
+msgid "Ideas"
+msgstr "灵感"
+
+#: lib/app.php:128
+msgid "Journey"
+msgstr "旅行"
+
+#: lib/app.php:129
+msgid "Jubilee"
+msgstr "五十年纪念"
+
+#: lib/app.php:130
+msgid "Meeting"
+msgstr "会面"
+
+#: lib/app.php:131
+msgid "Other"
+msgstr "其它"
+
+#: lib/app.php:132
+msgid "Personal"
+msgstr "个人的"
+
+#: lib/app.php:133
+msgid "Projects"
+msgstr "项目"
+
+#: lib/app.php:134
+msgid "Questions"
+msgstr "问题"
+
+#: lib/app.php:135
+msgid "Work"
+msgstr "工作"
+
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
+msgid "unnamed"
+msgstr ""
+
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "新的日历"
+
+#: lib/object.php:372
+msgid "Does not repeat"
+msgstr "不要重复"
+
+#: lib/object.php:373
+msgid "Daily"
+msgstr "每天"
+
+#: lib/object.php:374
+msgid "Weekly"
+msgstr "每星期"
+
+#: lib/object.php:375
+msgid "Every Weekday"
+msgstr "每个周末"
+
+#: lib/object.php:376
+msgid "Bi-Weekly"
+msgstr "每两周"
+
+#: lib/object.php:377
+msgid "Monthly"
+msgstr "每个月"
+
+#: lib/object.php:378
+msgid "Yearly"
+msgstr "每年"
+
+#: lib/object.php:388
+msgid "never"
+msgstr "从不"
+
+#: lib/object.php:389
+msgid "by occurrences"
+msgstr "根据发生时"
+
+#: lib/object.php:390
+msgid "by date"
+msgstr "根据日期"
+
+#: lib/object.php:400
+msgid "by monthday"
+msgstr "根据月天"
+
+#: lib/object.php:401
+msgid "by weekday"
+msgstr "根据星期"
+
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
+msgid "Monday"
+msgstr "星期一"
+
+#: lib/object.php:412 templates/calendar.php:5
+msgid "Tuesday"
+msgstr "星期二"
+
+#: lib/object.php:413 templates/calendar.php:5
+msgid "Wednesday"
+msgstr "星期三"
+
+#: lib/object.php:414 templates/calendar.php:5
+msgid "Thursday"
+msgstr "星期四"
+
+#: lib/object.php:415 templates/calendar.php:5
+msgid "Friday"
+msgstr "星期五"
+
+#: lib/object.php:416 templates/calendar.php:5
+msgid "Saturday"
+msgstr "星期六"
+
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
+msgid "Sunday"
+msgstr "星期天"
+
+#: lib/object.php:427
+msgid "events week of month"
+msgstr "时间每月发生的周数"
+
+#: lib/object.php:428
+msgid "first"
+msgstr "首先"
+
+#: lib/object.php:429
+msgid "second"
+msgstr "其次"
+
+#: lib/object.php:430
+msgid "third"
+msgstr "第三"
+
+#: lib/object.php:431
+msgid "fourth"
+msgstr "第四"
+
+#: lib/object.php:432
+msgid "fifth"
+msgstr "第五"
+
+#: lib/object.php:433
+msgid "last"
+msgstr "最后"
+
+#: lib/object.php:467 templates/calendar.php:7
+msgid "January"
+msgstr "一月"
+
+#: lib/object.php:468 templates/calendar.php:7
+msgid "February"
+msgstr "二月"
+
+#: lib/object.php:469 templates/calendar.php:7
+msgid "March"
+msgstr "三月"
+
+#: lib/object.php:470 templates/calendar.php:7
+msgid "April"
+msgstr "四月"
+
+#: lib/object.php:471 templates/calendar.php:7
+msgid "May"
+msgstr "五月"
+
+#: lib/object.php:472 templates/calendar.php:7
+msgid "June"
+msgstr "六月"
+
+#: lib/object.php:473 templates/calendar.php:7
+msgid "July"
+msgstr "七月"
+
+#: lib/object.php:474 templates/calendar.php:7
+msgid "August"
+msgstr "八月"
+
+#: lib/object.php:475 templates/calendar.php:7
+msgid "September"
+msgstr "九月"
+
+#: lib/object.php:476 templates/calendar.php:7
+msgid "October"
+msgstr "十月"
+
+#: lib/object.php:477 templates/calendar.php:7
+msgid "November"
+msgstr "十一月"
+
+#: lib/object.php:478 templates/calendar.php:7
+msgid "December"
+msgstr "十二月"
+
+#: lib/object.php:488
+msgid "by events date"
+msgstr "根据时间日期"
+
+#: lib/object.php:489
+msgid "by yearday(s)"
+msgstr "根据年数"
+
+#: lib/object.php:490
+msgid "by weeknumber(s)"
+msgstr "根据周数"
+
+#: lib/object.php:491
+msgid "by day and month"
+msgstr "根据天和月"
+
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
+msgid "Date"
+msgstr "日期"
+
+#: lib/search.php:43
+msgid "Cal."
+msgstr "Cal."
+
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
+#: templates/calendar.php:11
+msgid "All day"
+msgstr "整天"
+
+#: templates/calendar.php:13
+msgid "Missing fields"
+msgstr "丢失的输入框"
+
+#: templates/calendar.php:14 templates/part.eventform.php:19
+#: templates/part.showevent.php:11
+msgid "Title"
+msgstr "标题"
+
+#: templates/calendar.php:16
+msgid "From Date"
+msgstr "从日期"
+
+#: templates/calendar.php:17
+msgid "From Time"
+msgstr "从时间"
+
+#: templates/calendar.php:18
+msgid "To Date"
+msgstr "到日期"
+
+#: templates/calendar.php:19
+msgid "To Time"
+msgstr "到时间"
+
+#: templates/calendar.php:20
+msgid "The event ends before it starts"
+msgstr "在它开始前需要结束的事件"
+
+#: templates/calendar.php:21
+msgid "There was a database fail"
+msgstr "发生了一个数据库失败"
+
+#: templates/calendar.php:39
+msgid "Week"
+msgstr "星期"
+
+#: templates/calendar.php:40
+msgid "Month"
+msgstr "月"
+
+#: templates/calendar.php:41
+msgid "List"
+msgstr "列表"
+
+#: templates/calendar.php:45
+msgid "Today"
+msgstr "今天"
+
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
+
+#: templates/part.choosecalendar.php:2
+msgid "Your calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:27
+#: templates/part.choosecalendar.rowfields.php:11
+msgid "CalDav Link"
+msgstr "CalDav 链接"
+
+#: templates/part.choosecalendar.php:31
+msgid "Shared calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:48
+msgid "No shared calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:8
+msgid "Share Calendar"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:14
+msgid "Download"
+msgstr "下载"
+
+#: templates/part.choosecalendar.rowfields.php:17
+msgid "Edit"
+msgstr "编辑"
+
+#: templates/part.choosecalendar.rowfields.php:20
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr "删除"
+
+#: templates/part.choosecalendar.rowfields.shared.php:4
+msgid "shared with you by"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr "新的日历"
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr "编辑日历"
+
+#: templates/part.editcalendar.php:12
+msgid "Displayname"
+msgstr "显示名称"
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr "活动"
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr "日历颜色"
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr "保存"
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr "提交"
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr " 取消"
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr "编辑一个事件"
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr "导出"
+
+#: templates/part.eventform.php:8 templates/part.showevent.php:3
+msgid "Eventinfo"
+msgstr ""
+
+#: templates/part.eventform.php:9 templates/part.showevent.php:4
+msgid "Repeating"
+msgstr ""
+
+#: templates/part.eventform.php:10 templates/part.showevent.php:5
+msgid "Alarm"
+msgstr ""
+
+#: templates/part.eventform.php:11 templates/part.showevent.php:6
+msgid "Attendees"
+msgstr ""
+
+#: templates/part.eventform.php:13
+msgid "Share"
+msgstr ""
+
+#: templates/part.eventform.php:21
+msgid "Title of the Event"
+msgstr "事件的标题"
+
+#: templates/part.eventform.php:27 templates/part.showevent.php:19
+msgid "Category"
+msgstr "分类"
+
+#: templates/part.eventform.php:29
+msgid "Separate categories with commas"
+msgstr ""
+
+#: templates/part.eventform.php:30
+msgid "Edit categories"
+msgstr ""
+
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
+msgid "All Day Event"
+msgstr "每天的事件"
+
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
+msgid "From"
+msgstr "从"
+
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
+msgid "To"
+msgstr "到"
+
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
+msgid "Advanced options"
+msgstr "进阶选项"
+
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
+msgid "Location"
+msgstr "地点"
+
+#: templates/part.eventform.php:83
+msgid "Location of the Event"
+msgstr "事件的地点"
+
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
+msgid "Description"
+msgstr "解释"
+
+#: templates/part.eventform.php:91
+msgid "Description of the Event"
+msgstr "事件描述"
+
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
+msgid "Repeat"
+msgstr "重复"
+
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
+msgid "Advanced"
+msgstr "进阶"
+
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
+msgid "Select weekdays"
+msgstr "选择星期"
+
+#: templates/part.eventform.php:164 templates/part.eventform.php:177
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
+msgid "Select days"
+msgstr "选择日"
+
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
+msgid "and the events day of year."
+msgstr "选择每年时间发生天数"
+
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
+msgid "and the events day of month."
+msgstr "选择每个月事件发生的天"
+
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
+msgid "Select months"
+msgstr "选择月份"
+
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
+msgid "Select weeks"
+msgstr "选择星期"
+
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
+msgid "and the events week of year."
+msgstr "每年时间发生的星期"
+
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
+msgid "Interval"
+msgstr "间隔"
+
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
+msgid "End"
+msgstr "结束"
+
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
+msgid "occurrences"
+msgstr "发生"
+
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "导入"
+
+#: templates/part.import.php:56
+msgid "Close Dialog"
+msgstr ""
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr "新建一个时间"
+
+#: templates/part.showevent.php:1
+msgid "View an event"
+msgstr ""
+
+#: templates/part.showevent.php:23
+msgid "No categories selected"
+msgstr ""
+
+#: templates/part.showevent.php:37
+msgid "of"
+msgstr ""
+
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
+msgid "at"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "Timezone"
+msgstr "时区"
+
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
+
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "24h"
+msgstr "24小时"
+
+#: templates/settings.php:58
+msgid "12h"
+msgstr "12小时"
+
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
+
+#: templates/share.dropdown.php:20
+msgid "Users"
+msgstr ""
+
+#: templates/share.dropdown.php:21
+msgid "select users"
+msgstr ""
+
+#: templates/share.dropdown.php:36 templates/share.dropdown.php:62
+msgid "Editable"
+msgstr ""
+
+#: templates/share.dropdown.php:48
+msgid "Groups"
+msgstr ""
+
+#: templates/share.dropdown.php:49
+msgid "select groups"
+msgstr ""
+
+#: templates/share.dropdown.php:75
+msgid "make public"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/contacts.po b/l10n/zh_CN.GB2312/contacts.po
new file mode 100644
index 00000000000..8a348956c14
--- /dev/null
+++ b/l10n/zh_CN.GB2312/contacts.po
@@ -0,0 +1,874 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
+msgid "id is not set."
+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 ""
+
+#: ajax/categories/categoriesfor.php:34
+msgid "Error setting checksum."
+msgstr ""
+
+#: ajax/categories/delete.php:19
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/categories/delete.php:26
+msgid "No address books found."
+msgstr ""
+
+#: ajax/categories/delete.php:34
+msgid "No contacts found."
+msgstr ""
+
+#: ajax/contact/add.php:47
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/contact/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/contact/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/contact/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr ""
+
+#: ajax/contact/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:37
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr ""
+
+#: ajax/contact/deleteproperty.php:44
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/contact/details.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contact/details.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/contact/saveproperty.php:42
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/contact/saveproperty.php:62
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:69
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/contact/saveproperty.php:144
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
+#: ajax/uploadphoto.php:68
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:36
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:48
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:51
+msgid "The loading photo is not valid."
+msgstr ""
+
+#: ajax/editname.php:31
+msgid "Contact ID is missing."
+msgstr ""
+
+#: ajax/oc_photo.php:32
+msgid "No photo path was submitted."
+msgstr ""
+
+#: ajax/oc_photo.php:39
+msgid "File doesn't exist:"
+msgstr ""
+
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:69
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:79
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:98
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:109
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:112
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:115
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:118
+msgid "Error finding image: "
+msgstr ""
+
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
+msgid "Error uploading contacts to storage."
+msgstr ""
+
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:19
+msgid "Contacts"
+msgstr ""
+
+#: js/contacts.js:71
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:71
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:76
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 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:1421 js/contacts.js:1452
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
+#: js/contacts.js:1337 js/contacts.js:1371
+msgid "Select type"
+msgstr ""
+
+#: js/contacts.js:1390
+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 ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
+msgid "This is not your addressbook."
+msgstr ""
+
+#: lib/app.php:68
+msgid "Contact could not be found."
+msgstr ""
+
+#: lib/app.php:112 templates/part.contact.php:117
+msgid "Address"
+msgstr ""
+
+#: lib/app.php:113
+msgid "Telephone"
+msgstr ""
+
+#: lib/app.php:114 templates/part.contact.php:116
+msgid "Email"
+msgstr ""
+
+#: 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:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
+msgid "Home"
+msgstr ""
+
+#: lib/app.php:133
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:135
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:136
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:137
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:138
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:139
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:140
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:146
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:194
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:195
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:196
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr ""
+
+#: lib/search.php:15
+msgid "Contact"
+msgstr ""
+
+#: templates/index.php:14
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18 templates/settings.php:9
+msgid "Addressbooks"
+msgstr ""
+
+#: templates/index.php:36 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:37
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:39
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:44
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:48
+msgid "Next addressbook"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Previous addressbook"
+msgstr ""
+
+#: templates/index.php:54
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:57
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:59
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:61
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:63
+msgid "Delete current contact"
+msgstr ""
+
+#: templates/part.contact.php:17
+msgid "Drop photo to upload"
+msgstr ""
+
+#: templates/part.contact.php:19
+msgid "Delete current photo"
+msgstr ""
+
+#: templates/part.contact.php:20
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:22
+msgid "Select photo from ownCloud"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:36
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:33
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:42
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:43 templates/part.contact.php:119
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:44
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:44
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:46
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:47 templates/part.contact.php:120
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:50
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:63 templates/part.contact.php:77
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:64
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:64
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:69
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:78
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:82
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:92
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:92
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:103
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:110
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:115
+msgid "Phone"
+msgstr ""
+
+#: templates/part.contact.php:118
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:123
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.contact.php:124
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:6
+msgid "Edit address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:10
+msgid "Type"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
+msgid "PO Box"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
+msgid "Extended"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
+msgid "City"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:42
+msgid "Region"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
+msgid "Zipcode"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:16
+msgid "Addressbook"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:23
+msgid "Hon. prefixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:27
+msgid "Miss"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:28
+msgid "Ms"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:29
+msgid "Mr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:30
+msgid "Sir"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:31
+msgid "Mrs"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:32
+msgid "Dr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:35
+msgid "Given name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:37
+msgid "Additional names"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:39
+msgid "Family name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:41
+msgid "Hon. suffixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:45
+msgid "J.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:46
+msgid "M.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:47
+msgid "D.O."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:48
+msgid "D.C."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:49
+msgid "Ph.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:50
+msgid "Esq."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:51
+msgid "Jr."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:52
+msgid "Sn."
+msgstr ""
+
+#: templates/part.import.php:1
+msgid "Import a contacts file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the addressbook"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new addressbook"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new addressbook"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing contacts"
+msgstr ""
+
+#: templates/part.no_contacts.php:3
+msgid "You have no contacts in your addressbook."
+msgstr ""
+
+#: templates/part.no_contacts.php:5
+msgid "Add contact"
+msgstr ""
+
+#: templates/part.no_contacts.php:6
+msgid "Configure addressbooks"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "CardDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php: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:30
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Save"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Cancel"
+msgstr ""
+
+#: templates/settings.php:49
+msgid "More..."
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
new file mode 100644
index 00000000000..ea582cd1c1b
--- /dev/null
+++ b/l10n/zh_CN.GB2312/core.po
@@ -0,0 +1,269 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <bluehattree@126.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 13:54+0000\n"
+"Last-Translator: bluehattree <bluehattree@126.com>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
+msgid "Application name not provided."
+msgstr "应用程序并没有被提供."
+
+#: ajax/vcategories/add.php:29
+msgid "No category to add?"
+msgstr "没有分类添加了?"
+
+#: ajax/vcategories/add.php:36
+msgid "This category already exists: "
+msgstr "这个分类已经存在了:"
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "设置"
+
+#: js/js.js:572
+msgid "January"
+msgstr "一月"
+
+#: js/js.js:572
+msgid "February"
+msgstr "二月"
+
+#: js/js.js:572
+msgid "March"
+msgstr "三月"
+
+#: js/js.js:572
+msgid "April"
+msgstr "四月"
+
+#: js/js.js:572
+msgid "May"
+msgstr "五月"
+
+#: js/js.js:572
+msgid "June"
+msgstr "六月"
+
+#: js/js.js:573
+msgid "July"
+msgstr "七月"
+
+#: js/js.js:573
+msgid "August"
+msgstr "八月"
+
+#: js/js.js:573
+msgid "September"
+msgstr "九月"
+
+#: js/js.js:573
+msgid "October"
+msgstr "十月"
+
+#: js/js.js:573
+msgid "November"
+msgstr "十一月"
+
+#: js/js.js:573
+msgid "December"
+msgstr "十二月"
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr "取消"
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr "否"
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr "是"
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr "好的"
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr "没有选者要删除的分类."
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr "错误"
+
+#: lostpassword/index.php:26
+msgid "ownCloud password reset"
+msgstr "私有云密码重置"
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr "使用下面的链接来重置你的密码:{link}"
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "你将会收到一个重置密码的链接"
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "请求"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "登陆失败!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: templates/login.php:9
+msgid "Username"
+msgstr "用户名"
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request reset"
+msgstr "要求重置"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "你的密码已经被重置了"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr "转至登陆页面"
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "新密码"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "重置密码"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "个人的"
+
+#: strings.php:6
+msgid "Users"
+msgstr "用户"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "应用程序"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "管理"
+
+#: strings.php:9
+msgid "Help"
+msgstr "帮助"
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr "禁止访问"
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "云 没有被找到"
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr "编辑分类"
+
+#: templates/edit_categories_dialog.php:14
+msgid "Add"
+msgstr "添加"
+
+#: templates/installation.php:23
+msgid "Create an <strong>admin account</strong>"
+msgstr "建立一个 <strong>管理帐户</strong>"
+
+#: templates/installation.php:29 templates/login.php:13
+msgid "Password"
+msgstr "密码"
+
+#: templates/installation.php:35
+msgid "Advanced"
+msgstr "进阶"
+
+#: templates/installation.php:37
+msgid "Data folder"
+msgstr "数据存放文件夹"
+
+#: templates/installation.php:44
+msgid "Configure the database"
+msgstr "配置数据库"
+
+#: templates/installation.php:49 templates/installation.php:60
+#: templates/installation.php:70
+msgid "will be used"
+msgstr "将会使用"
+
+#: templates/installation.php:82
+msgid "Database user"
+msgstr "数据库用户"
+
+#: templates/installation.php:86
+msgid "Database password"
+msgstr "数据库密码"
+
+#: templates/installation.php:90
+msgid "Database name"
+msgstr "数据库用户名"
+
+#: templates/installation.php:96
+msgid "Database host"
+msgstr "数据库主机"
+
+#: templates/installation.php:101
+msgid "Finish setup"
+msgstr "完成安装"
+
+#: templates/layout.guest.php:42
+msgid "web services under your control"
+msgstr "你控制下的网络服务"
+
+#: templates/layout.user.php:49
+msgid "Log out"
+msgstr "注销"
+
+#: templates/login.php:6
+msgid "Lost your password?"
+msgstr "忘记密码?"
+
+#: templates/login.php:17
+msgid "remember"
+msgstr "备忘"
+
+#: templates/login.php:18
+msgid "Log in"
+msgstr "登陆"
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr "你已经注销了"
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "后退"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "前进"
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
new file mode 100644
index 00000000000..b1da62d32e8
--- /dev/null
+++ b/l10n/zh_CN.GB2312/files.po
@@ -0,0 +1,223 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <bluehattree@126.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 14:04+0000\n"
+"Last-Translator: bluehattree <bluehattree@126.com>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/upload.php:20
+msgid "There is no error, the file uploaded with success"
+msgstr "没有任何错误,文件上传成功了"
+
+#: ajax/upload.php:21
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr "上传的文件超过了php.ini指定的upload_max_filesize"
+
+#: ajax/upload.php:22
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr "上传的文件超过了HTML表单指定的MAX_FILE_SIZE"
+
+#: ajax/upload.php:23
+msgid "The uploaded file was only partially uploaded"
+msgstr "文件只有部分被上传"
+
+#: ajax/upload.php:24
+msgid "No file was uploaded"
+msgstr "没有上传完成的文件"
+
+#: ajax/upload.php:25
+msgid "Missing a temporary folder"
+msgstr "丢失了一个临时文件夹"
+
+#: ajax/upload.php:26
+msgid "Failed to write to disk"
+msgstr "写磁盘失败"
+
+#: appinfo/app.php:6
+msgid "Files"
+msgstr "文件"
+
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr "未分享的"
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr "删除"
+
+#: js/filelist.js:141
+msgid "already exists"
+msgstr "已经存在了"
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr "替换"
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr "取消"
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr "替换过了"
+
+#: js/filelist.js:195
+msgid "with"
+msgstr "随着"
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "撤销"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "删除"
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr "正在生成ZIP文件,这可能需要点时间"
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "不能上传你指定的文件,可能因为它是个文件夹或者大小为0"
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr "上传错误"
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr "Pending"
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr "上传取消了"
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr "非法文件名,\"/\"是不被许可的"
+
+#: js/files.js:694 templates/index.php:55
+msgid "Size"
+msgstr "大小"
+
+#: js/files.js:695 templates/index.php:56
+msgid "Modified"
+msgstr "修改日期"
+
+#: js/files.js:722
+msgid "folder"
+msgstr "文件夹"
+
+#: js/files.js:724
+msgid "folders"
+msgstr "文件夹"
+
+#: js/files.js:732
+msgid "file"
+msgstr "文件"
+
+#: js/files.js:734
+msgid "files"
+msgstr "文件"
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr "文件处理中"
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr "最大上传大小"
+
+#: templates/admin.php:7
+msgid "max. possible: "
+msgstr "最大可能"
+
+#: templates/admin.php:9
+msgid "Needed for multi-file and folder downloads."
+msgstr "需要多文件和文件夹下载."
+
+#: templates/admin.php:9
+msgid "Enable ZIP-download"
+msgstr "支持ZIP下载"
+
+#: templates/admin.php:11
+msgid "0 is unlimited"
+msgstr "0是无限的"
+
+#: templates/admin.php:12
+msgid "Maximum input size for ZIP files"
+msgstr "最大的ZIP文件输入大小"
+
+#: templates/index.php:7
+msgid "New"
+msgstr "新建"
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr "文本文档"
+
+#: templates/index.php:10
+msgid "Folder"
+msgstr "文件夹"
+
+#: templates/index.php:11
+msgid "From url"
+msgstr "从URL:"
+
+#: templates/index.php:21
+msgid "Upload"
+msgstr "上传"
+
+#: templates/index.php:27
+msgid "Cancel upload"
+msgstr "取消上传"
+
+#: templates/index.php:39
+msgid "Nothing in here. Upload something!"
+msgstr "这里没有东西.上传点什么!"
+
+#: templates/index.php:47
+msgid "Name"
+msgstr "名字"
+
+#: templates/index.php:49
+msgid "Share"
+msgstr "分享"
+
+#: templates/index.php:51
+msgid "Download"
+msgstr "下载"
+
+#: templates/index.php:64
+msgid "Upload too large"
+msgstr "上传的文件太大了"
+
+#: templates/index.php:66
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "你正在试图上传的文件超过了此服务器支持的最大的文件大小."
+
+#: templates/index.php:71
+msgid "Files are being scanned, please wait."
+msgstr "正在扫描文件,请稍候."
+
+#: templates/index.php:74
+msgid "Current scanning"
+msgstr "正在扫描"
diff --git a/l10n/zh_CN.GB2312/files_encryption.po b/l10n/zh_CN.GB2312/files_encryption.po
new file mode 100644
index 00000000000..2073826c24d
--- /dev/null
+++ b/l10n/zh_CN.GB2312/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/files_external.po b/l10n/zh_CN.GB2312/files_external.po
new file mode 100644
index 00000000000..27dfa58801b
--- /dev/null
+++ b/l10n/zh_CN.GB2312/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
new file mode 100644
index 00000000000..a3a249084f5
--- /dev/null
+++ b/l10n/zh_CN.GB2312/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/files_versions.po b/l10n/zh_CN.GB2312/files_versions.po
new file mode 100644
index 00000000000..4eaa105db8a
--- /dev/null
+++ b/l10n/zh_CN.GB2312/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/gallery.po b/l10n/zh_CN.GB2312/gallery.po
new file mode 100644
index 00000000000..32b2ed7179f
--- /dev/null
+++ b/l10n/zh_CN.GB2312/gallery.po
@@ -0,0 +1,58 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-01-15 13:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:39
+msgid "Pictures"
+msgstr ""
+
+#: js/pictures.js:12
+msgid "Share gallery"
+msgstr ""
+
+#: js/pictures.js:32
+msgid "Error: "
+msgstr ""
+
+#: js/pictures.js:32
+msgid "Internal error"
+msgstr ""
+
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr ""
+
+#: templates/view_album.php:19
+msgid "Back"
+msgstr ""
+
+#: templates/view_album.php:36
+msgid "Remove confirmation"
+msgstr ""
+
+#: templates/view_album.php:37
+msgid "Do you want to remove album"
+msgstr ""
+
+#: templates/view_album.php:40
+msgid "Change album name"
+msgstr ""
+
+#: templates/view_album.php:43
+msgid "New album name"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po
new file mode 100644
index 00000000000..49d72542b8d
--- /dev/null
+++ b/l10n/zh_CN.GB2312/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: app.php:288
+msgid "Help"
+msgstr ""
+
+#: app.php:295
+msgid "Personal"
+msgstr ""
+
+#: app.php:300
+msgid "Settings"
+msgstr ""
+
+#: app.php:305
+msgid "Users"
+msgstr ""
+
+#: app.php:312
+msgid "Apps"
+msgstr ""
+
+#: app.php:314
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/media.po b/l10n/zh_CN.GB2312/media.po
new file mode 100644
index 00000000000..844e38b16f2
--- /dev/null
+++ b/l10n/zh_CN.GB2312/media.po
@@ -0,0 +1,67 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <bluehattree@126.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 14:06+0000\n"
+"Last-Translator: bluehattree <bluehattree@126.com>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: appinfo/app.php:45 templates/player.php:8
+msgid "Music"
+msgstr "音乐"
+
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr "添加专辑到播放列表"
+
+#: templates/music.php:3 templates/player.php:12
+msgid "Play"
+msgstr "播放"
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
+msgid "Pause"
+msgstr "暂停"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr "前面的"
+
+#: templates/music.php:6 templates/player.php:14
+msgid "Next"
+msgstr "下一个"
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr "静音"
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr "取消静音"
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr "重新扫描收藏"
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr "艺术家"
+
+#: templates/music.php:38
+msgid "Album"
+msgstr "专辑"
+
+#: templates/music.php:39
+msgid "Title"
+msgstr "标题"
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
new file mode 100644
index 00000000000..b451fb6d414
--- /dev/null
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -0,0 +1,239 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <bluehattree@126.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr "不能从App Store 中加载列表"
+
+#: ajax/lostpassword.php:14
+msgid "Email saved"
+msgstr "Email 保存了"
+
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr "非法Email"
+
+#: ajax/openid.php:16
+msgid "OpenID Changed"
+msgstr "OpenID 改变了"
+
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
+msgid "Invalid request"
+msgstr "非法请求"
+
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "认证错误"
+
+#: ajax/setlanguage.php:18
+msgid "Language changed"
+msgstr "语言改变了"
+
+#: js/apps.js:18
+msgid "Error"
+msgstr "错误"
+
+#: js/apps.js:39 js/apps.js:73
+msgid "Disable"
+msgstr "禁用"
+
+#: js/apps.js:39 js/apps.js:62
+msgid "Enable"
+msgstr "启用"
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr "保存中..."
+
+#: personal.php:46 personal.php:47
+msgid "__language_name__"
+msgstr "Chinese"
+
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr "安全警告"
+
+#: templates/admin.php:29
+msgid "Cron"
+msgstr "定时"
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
+msgid "Log"
+msgstr "日志"
+
+#: templates/admin.php:67
+msgid "More"
+msgstr "更多"
+
+#: templates/apps.php:10
+msgid "Add your App"
+msgstr "添加你的应用程序"
+
+#: templates/apps.php:26
+msgid "Select an App"
+msgstr "选择一个程序"
+
+#: templates/apps.php:29
+msgid "See application page at apps.owncloud.com"
+msgstr "在owncloud.com上查看应用程序"
+
+#: templates/apps.php:30
+msgid "-licensed"
+msgstr "-许可了"
+
+#: templates/apps.php:30
+msgid "by"
+msgstr "由"
+
+#: templates/help.php:8
+msgid "Documentation"
+msgstr "文档"
+
+#: templates/help.php:9
+msgid "Managing Big Files"
+msgstr "管理大文件"
+
+#: templates/help.php:10
+msgid "Ask a question"
+msgstr "提一个问题"
+
+#: templates/help.php:22
+msgid "Problems connecting to help database."
+msgstr "连接到帮助数据库时的问题"
+
+#: templates/help.php:23
+msgid "Go there manually."
+msgstr "收到转到."
+
+#: templates/help.php:31
+msgid "Answer"
+msgstr "回答"
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr "你使用"
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr "可用的"
+
+#: templates/personal.php:12
+msgid "Desktop and Mobile Syncing Clients"
+msgstr "桌面和移动同步客户端"
+
+#: templates/personal.php:13
+msgid "Download"
+msgstr "下载"
+
+#: templates/personal.php:19
+msgid "Your password got changed"
+msgstr "你的密码已经改变"
+
+#: templates/personal.php:20
+msgid "Unable to change your password"
+msgstr "不能改变你的密码"
+
+#: templates/personal.php:21
+msgid "Current password"
+msgstr "现在的密码"
+
+#: templates/personal.php:22
+msgid "New password"
+msgstr "新密码"
+
+#: templates/personal.php:23
+msgid "show"
+msgstr "展示"
+
+#: templates/personal.php:24
+msgid "Change password"
+msgstr "改变密码"
+
+#: templates/personal.php:30
+msgid "Email"
+msgstr "Email"
+
+#: templates/personal.php:31
+msgid "Your email address"
+msgstr "你的email地址"
+
+#: templates/personal.php:32
+msgid "Fill in an email address to enable password recovery"
+msgstr "输入一个邮箱地址以激活密码恢复功能"
+
+#: templates/personal.php:38 templates/personal.php:39
+msgid "Language"
+msgstr "语言"
+
+#: templates/personal.php:44
+msgid "Help translate"
+msgstr "帮助翻译"
+
+#: templates/personal.php:51
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr "使用这个地址和你的文件管理器连接到你的ownCloud"
+
+#: templates/users.php:21 templates/users.php:76
+msgid "Name"
+msgstr "名字"
+
+#: templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "密码"
+
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
+msgid "Groups"
+msgstr "组"
+
+#: templates/users.php:32
+msgid "Create"
+msgstr "新建"
+
+#: templates/users.php:35
+msgid "Default Quota"
+msgstr "默认限额"
+
+#: templates/users.php:55 templates/users.php:138
+msgid "Other"
+msgstr "其他的"
+
+#: templates/users.php:80 templates/users.php:112
+msgid "SubAdmin"
+msgstr "子专辑"
+
+#: templates/users.php:82
+msgid "Quota"
+msgstr "限额"
+
+#: templates/users.php:146
+msgid "Delete"
+msgstr "删除"
diff --git a/l10n/zh_CN.GB2312/tasks.po b/l10n/zh_CN.GB2312/tasks.po
new file mode 100644
index 00000000000..5d43b9b7ec3
--- /dev/null
+++ b/l10n/zh_CN.GB2312/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
new file mode 100644
index 00000000000..725d441e3c4
--- /dev/null
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/user_migrate.po b/l10n/zh_CN.GB2312/user_migrate.po
new file mode 100644
index 00000000000..06769367e75
--- /dev/null
+++ b/l10n/zh_CN.GB2312/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/user_openid.po b/l10n/zh_CN.GB2312/user_openid.po
new file mode 100644
index 00000000000..1937fffe2a7
--- /dev/null
+++ b/l10n/zh_CN.GB2312/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN.GB2312\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/zh_CN/admin_dependencies_chk.po b/l10n/zh_CN/admin_dependencies_chk.po
new file mode 100644
index 00000000000..6200d7451b8
--- /dev/null
+++ b/l10n/zh_CN/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/zh_CN/admin_migrate.po b/l10n/zh_CN/admin_migrate.po
new file mode 100644
index 00000000000..a25182363fb
--- /dev/null
+++ b/l10n/zh_CN/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/zh_CN/calendar.po b/l10n/zh_CN/calendar.po
index 5353f15cdb3..b66ae0afc11 100644
--- a/l10n/zh_CN/calendar.po
+++ b/l10n/zh_CN/calendar.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Phoenix Nemo <>, 2012.
 #   <rainofchaos@gmail.com>, 2012.
 #   <wengxt@gmail.com>, 2011, 2012.
 # 冰 蓝 <lanbing89@gmail.com>, 2012.
@@ -10,21 +11,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "无法找到日历。"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "无法找到事件。"
 
@@ -32,300 +41,394 @@ msgstr "无法找到事件。"
 msgid "Wrong calendar"
 msgstr "错误的日历"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "新时区："
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "时区已修改"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "非法请求"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "日历"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "生日"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "商务"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "呼叫"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "客户"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "派送"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "节日"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "想法"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "旅行"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "周年纪念"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "会议"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "其他"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "个人"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "项目"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "问题"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "工作"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "未命名"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "新日历"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "不重复"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "每天"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "每周"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "每个工作日"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "每两周"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "每月"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "每年"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "从不"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "按发生次数"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "按日期"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "按月的某天"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "按星期的某天"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "星期一"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "星期二"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "星期三"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "星期四"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "星期五"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "星期六"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "星期日"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "事件在每月的第几个星期"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "第一"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "第二"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "第三"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "第四"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "第五"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "最后"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "一月"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "二月"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "三月"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "四月"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "五月"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "六月"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "七月"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "八月"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "九月"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "十月"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "十一月"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "十二月"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "按事件日期"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "按每年的某天"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "按星期数"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "按天和月份"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "日期"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "日历"
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "全天"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "新日历"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "缺少字段"
@@ -359,40 +462,32 @@ msgstr "事件在开始前已结束"
 msgid "There was a database fail"
 msgstr "数据库访问失败"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "星期"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "月"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "列表"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "今天"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "日历"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "解析文件失败"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "选择活动日历"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "您的日历"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav 链接"
 
@@ -404,19 +499,19 @@ msgstr "共享的日历"
 msgid "No shared calendars"
 msgstr "无共享的日历"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "共享日历"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "下载"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "编辑"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "删除"
@@ -502,23 +597,23 @@ msgstr "用逗号分隔分类"
 msgid "Edit categories"
 msgstr "编辑分类"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "全天事件"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "自"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "至"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "高级选项"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "地点"
 
@@ -526,7 +621,7 @@ msgstr "地点"
 msgid "Location of the Event"
 msgstr "事件地点"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "描述"
 
@@ -534,84 +629,86 @@ msgstr "描述"
 msgid "Description of the Event"
 msgstr "事件描述"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "重复"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "高级"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "选择星期中的某天"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "选择某天"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "选择每年事件发生的日子"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "选择每月事件发生的日子"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "选择月份"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "选择星期"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "选择每年的事件发生的星期"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "间隔"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "结束"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "次"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "创建新日历"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "导入日历文件"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "请选择日历"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "创建新日历"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "新日历名称"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "导入"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "导入日历"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "导入日历成功"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "导入"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "关闭对话框"
 
@@ -627,45 +724,73 @@ msgstr "查看事件"
 msgid "No categories selected"
 msgstr "无选中分类"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "选择分类"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "在"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "在"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "时区"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "选中则总是按照时区变化"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "时间格式"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24小时"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12小时"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "每周的第一天"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "日历CalDAV 同步地址："
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index f12fcc02ee7..0c73f885ca4 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "Error (de)activating addressbook."
 msgstr "(取消)激活地址簿错误。"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr "没有设置 id。"
 
@@ -62,7 +62,7 @@ msgstr "找不到联系人。"
 msgid "There was an error adding the contact."
 msgstr "添加联系人时出错。"
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr "元素名称未设置"
 
@@ -86,11 +86,11 @@ msgstr "试图添加重复属性： "
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard 的信息不正确。请重新加载页面。"
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "删除联系人属性错误。"
 
@@ -102,19 +102,19 @@ msgstr "缺少 ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "无法解析如下ID的 VCard：“"
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr "未设置校验值。"
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCard 信息不正确。请刷新页面: "
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr "有一些信息无法被处理。"
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "更新联系人属性错误。"
 
@@ -163,19 +163,19 @@ msgstr "获取照片属性时出错。"
 msgid "Error saving contact."
 msgstr "保存联系人时出错。"
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr "缩放图像时出错"
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr "裁切图像时出错"
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr "创建临时图像时出错"
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr "查找图像时出错: "
 
@@ -275,6 +275,10 @@ msgid ""
 "on this server."
 msgstr "您试图上传的文件超出了该服务器的最大文件限制"
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr "选择类型"
@@ -533,7 +537,7 @@ msgstr "编辑名称详情"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "删除"
 
@@ -844,30 +848,30 @@ msgstr ""
 msgid "Download"
 msgstr "下载"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "编辑"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "新建地址簿"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "保存"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "取消"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
new file mode 100644
index 00000000000..19d9d60f7df
--- /dev/null
+++ b/l10n/zh_CN/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
new file mode 100644
index 00000000000..aacc93cf5c3
--- /dev/null
+++ b/l10n/zh_CN/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
new file mode 100644
index 00000000000..60a76214fec
--- /dev/null
+++ b/l10n/zh_CN/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/zh_CN/files_versions.po b/l10n/zh_CN/files_versions.po
new file mode 100644
index 00000000000..4e84f1f4d82
--- /dev/null
+++ b/l10n/zh_CN/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 783ce4e6526..14d709456d8 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -72,11 +72,27 @@ msgstr "简体中文"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "更多"
 
diff --git a/l10n/zh_CN/tasks.po b/l10n/zh_CN/tasks.po
new file mode 100644
index 00000000000..7f27dae57f2
--- /dev/null
+++ b/l10n/zh_CN/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
new file mode 100644
index 00000000000..5e871541a09
--- /dev/null
+++ b/l10n/zh_CN/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/zh_CN/user_migrate.po b/l10n/zh_CN/user_migrate.po
new file mode 100644
index 00000000000..f422c21ddf4
--- /dev/null
+++ b/l10n/zh_CN/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/zh_CN/user_openid.po b/l10n/zh_CN/user_openid.po
new file mode 100644
index 00000000000..a7e4f24cc21
--- /dev/null
+++ b/l10n/zh_CN/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/l10n/zh_TW/admin_dependencies_chk.po b/l10n/zh_TW/admin_dependencies_chk.po
new file mode 100644
index 00000000000..9519ecc8d96
--- /dev/null
+++ b/l10n/zh_TW/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""
diff --git a/l10n/zh_TW/admin_migrate.po b/l10n/zh_TW/admin_migrate.po
new file mode 100644
index 00000000000..ad633109b33
--- /dev/null
+++ b/l10n/zh_TW/admin_migrate.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Export this ownCloud instance"
+msgstr ""
+
+#: templates/settings.php:4
+msgid ""
+"This will create a compressed file that contains the data of this owncloud instance.\n"
+"            Please choose the export type:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Export"
+msgstr ""
diff --git a/l10n/zh_TW/calendar.po b/l10n/zh_TW/calendar.po
index 60f1e1c802e..4af2f935880 100644
--- a/l10n/zh_TW/calendar.po
+++ b/l10n/zh_TW/calendar.po
@@ -9,21 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:02+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "沒有找到行事曆"
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "沒有找到活動"
 
@@ -31,300 +39,394 @@ msgstr "沒有找到活動"
 msgid "Wrong calendar"
 msgstr "錯誤日曆"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "新時區："
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "時區已變更"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "無效請求"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
-#: templates/settings.php:12
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "日曆"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
-#: js/calendar.js:828
+#: js/calendar.js:832
 msgid "ddd"
 msgstr ""
 
-#: js/calendar.js:829
+#: js/calendar.js:833
 msgid "ddd M/d"
 msgstr ""
 
-#: js/calendar.js:830
+#: js/calendar.js:834
 msgid "dddd M/d"
 msgstr ""
 
-#: js/calendar.js:833
+#: js/calendar.js:837
 msgid "MMMM yyyy"
 msgstr ""
 
-#: js/calendar.js:835
+#: js/calendar.js:839
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
-#: js/calendar.js:837
+#: js/calendar.js:841
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "生日"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "商業"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "呼叫"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "客戶"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "遞送者"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "節日"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "主意"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "旅行"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "周年慶"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "會議"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "其他"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "個人"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "計畫"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "問題"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "工作"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "無名稱的"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "新日曆"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "不重覆"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "每日"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "每週"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "每週末"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "每雙週"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "每月"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "每年"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "絕不"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "由事件"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "由日期"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "依月份日期"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "由平日"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:69
 msgid "Monday"
 msgstr "週一"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "週二"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "週三"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "週四"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "週五"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "週六"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:70
 msgid "Sunday"
 msgstr "週日"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "月份中活動週"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "第一"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "第二"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "第三"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "第四"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "第五"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "最後"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "一月"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "二月"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "三月"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "四月"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "五月"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "六月"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "七月"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "八月"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "九月"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "十月"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "十一月"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "十二月"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "由事件日期"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "依年份日期"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "由週數"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "由日與月"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "日期"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "行事曆"
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "整天"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "新日曆"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "遺失欄位"
@@ -358,40 +460,32 @@ msgstr "事件的結束在開始之前"
 msgid "There was a database fail"
 msgstr "資料庫錯誤"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:39
 msgid "Week"
 msgstr "週"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:40
 msgid "Month"
 msgstr "月"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:41
 msgid "List"
 msgstr "清單"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:45
 msgid "Today"
 msgstr "今日"
 
-#: templates/calendar.php:49
-msgid "Calendars"
-msgstr "日曆"
-
-#: templates/calendar.php:67
-msgid "There was a fail, while parsing the file."
-msgstr "解析檔案時失敗。"
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr "選擇一個作用中的日曆"
+#: templates/calendar.php:46 templates/calendar.php:47
+msgid "Settings"
+msgstr ""
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
 msgstr "你的行事曆"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav 聯結"
 
@@ -403,19 +497,19 @@ msgstr "分享的行事曆"
 msgid "No shared calendars"
 msgstr "不分享的行事曆"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "分享行事曆"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "下載"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "編輯"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "刪除"
@@ -501,23 +595,23 @@ msgstr "用逗點分隔分類"
 msgid "Edit categories"
 msgstr "編輯分類"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "全天事件"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "自"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "至"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "進階選項"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "位置"
 
@@ -525,7 +619,7 @@ msgstr "位置"
 msgid "Location of the Event"
 msgstr "事件位置"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "描述"
 
@@ -533,84 +627,86 @@ msgstr "描述"
 msgid "Description of the Event"
 msgstr "事件描述"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "重覆"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "進階"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "選擇平日"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "選擇日"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "以及年中的活動日"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "以及月中的活動日"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "選擇月"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "選擇週"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "以及年中的活動週"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "間隔"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "結束"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "事件"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "建立新日曆"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "匯入日曆檔案"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "請選擇日曆"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "建立新日曆"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "新日曆名稱"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "匯入"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "匯入日曆"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "已成功匯入日曆"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "匯入"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "關閉對話"
 
@@ -626,45 +722,73 @@ msgstr "觀看一個活動"
 msgid "No categories selected"
 msgstr "沒有選擇分類"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "選擇分類"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "於"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "於"
 
-#: templates/settings.php:14
+#: templates/settings.php:10
+msgid "General"
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Timezone"
 msgstr "時區"
 
-#: templates/settings.php:31
-msgid "Check always for changes of the timezone"
-msgstr "總是檢查是否變更了時區"
+#: templates/settings.php:47
+msgid "Update timezone automatically"
+msgstr ""
 
-#: templates/settings.php:33
-msgid "Timeformat"
-msgstr "日期格式"
+#: templates/settings.php:52
+msgid "Time format"
+msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:57
 msgid "24h"
 msgstr "24小時制"
 
-#: templates/settings.php:36
+#: templates/settings.php:58
 msgid "12h"
 msgstr "12小時制"
 
-#: templates/settings.php:40
-msgid "First day of the week"
-msgstr "每週的第一天"
+#: templates/settings.php:64
+msgid "Start week on"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "URLs"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "CalDAV 的日曆同步地址："
+#: templates/settings.php:87
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/zh_TW/contacts.po b/l10n/zh_TW/contacts.po
index 6c642338703..d3df1f28104 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-08-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-04 00:02+0000\n"
+"POT-Creation-Date: 2012-08-11 02:02+0200\n"
+"PO-Revision-Date: 2012-08-11 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "Error (de)activating addressbook."
 msgstr "在啟用或關閉電話簿時發生錯誤"
 
 #: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
-#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:30
-#: ajax/contact/saveproperty.php:37
+#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
+#: ajax/contact/saveproperty.php:39
 msgid "id is not set."
 msgstr ""
 
@@ -61,7 +61,7 @@ msgstr "沒有找到聯絡人"
 msgid "There was an error adding the contact."
 msgstr "添加通訊錄發生錯誤"
 
-#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:34
+#: ajax/contact/addproperty.php:39 ajax/contact/saveproperty.php:36
 msgid "element name is not set."
 msgstr ""
 
@@ -85,11 +85,11 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/contact/deleteproperty.php:36
+#: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "有關 vCard 的資訊不正確，請重新載入此頁。"
 
-#: ajax/contact/deleteproperty.php:43
+#: ajax/contact/deleteproperty.php:44
 msgid "Error deleting contact property."
 msgstr "刪除通訊錄內容中發生錯誤"
 
@@ -101,19 +101,19 @@ msgstr "遺失ID"
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/contact/saveproperty.php:40
+#: ajax/contact/saveproperty.php:42
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/contact/saveproperty.php:60
+#: ajax/contact/saveproperty.php:62
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:67
+#: ajax/contact/saveproperty.php:69
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/contact/saveproperty.php:142
+#: ajax/contact/saveproperty.php:144
 msgid "Error updating contact property."
 msgstr "更新通訊錄內容中發生錯誤"
 
@@ -162,19 +162,19 @@ msgstr ""
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:108
+#: ajax/savecrop.php:109
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:111
+#: ajax/savecrop.php:112
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:114
+#: ajax/savecrop.php:115
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:117
+#: ajax/savecrop.php:118
 msgid "Error finding image: "
 msgstr ""
 
@@ -274,6 +274,10 @@ msgid ""
 "on this server."
 msgstr ""
 
+#: js/contacts.js:1236
+msgid "Error loading profile picture."
+msgstr ""
+
 #: js/contacts.js:1337 js/contacts.js:1371
 msgid "Select type"
 msgstr ""
@@ -532,7 +536,7 @@ msgstr "編輯姓名詳細資訊"
 
 #: templates/part.contact.php:40 templates/part.contact.php:42
 #: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:34
+#: templates/part.contact.php:50 templates/settings.php:33
 msgid "Delete"
 msgstr "刪除"
 
@@ -843,30 +847,30 @@ msgstr ""
 msgid "Download"
 msgstr "下載"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
 msgid "Edit"
 msgstr "編輯"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
 msgid "New Address Book"
 msgstr "新電話簿"
 
-#: templates/settings.php:42
+#: templates/settings.php:41
 msgid "Name"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:42
 msgid "Description"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:43
 msgid "Save"
 msgstr "儲存"
 
-#: templates/settings.php:46
+#: templates/settings.php:44
 msgid "Cancel"
 msgstr "取消"
 
-#: templates/settings.php:51
+#: templates/settings.php:49
 msgid "More..."
 msgstr ""
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
new file mode 100644
index 00000000000..86ca709cfa6
--- /dev/null
+++ b/l10n/zh_TW/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
new file mode 100644
index 00000000000..9a6a0d7c43a
--- /dev/null
+++ b/l10n/zh_TW/files_external.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
new file mode 100644
index 00000000000..29566a0bae3
--- /dev/null
+++ b/l10n/zh_TW/files_sharing.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/list.php:2
+msgid "Your Shared Files"
+msgstr ""
+
+#: templates/list.php:6
+msgid "Item"
+msgstr ""
+
+#: templates/list.php:7
+msgid "Shared With"
+msgstr ""
+
+#: templates/list.php:8
+msgid "Permissions"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Read"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Edit"
+msgstr ""
+
+#: templates/list.php:16 templates/list.php:17
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Resharing"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Allow users to reshare files they don't own"
+msgstr ""
diff --git a/l10n/zh_TW/files_versions.po b/l10n/zh_TW/files_versions.po
new file mode 100644
index 00000000000..2214a0ec19f
--- /dev/null
+++ b/l10n/zh_TW/files_versions.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/settings-personal.js:31
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index be9f9d50a8e..890940b3971 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-08-05 19:00+0200\n"
-"PO-Revision-Date: 2012-08-05 17:01+0000\n"
+"POT-Creation-Date: 2012-08-12 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -70,11 +70,27 @@ msgstr "__語言_名稱__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:31
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:39
 msgid "Log"
 msgstr "紀錄"
 
-#: templates/admin.php:56
+#: templates/admin.php:67
 msgid "More"
 msgstr "更多"
 
diff --git a/l10n/zh_TW/tasks.po b/l10n/zh_TW/tasks.po
new file mode 100644
index 00000000000..10432eca2df
--- /dev/null
+++ b/l10n/zh_TW/tasks.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
+msgid "Invalid date/time"
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Tasks"
+msgstr ""
+
+#: js/tasks.js:415
+msgid "No category"
+msgstr ""
+
+#: lib/app.php:33
+msgid "Unspecified"
+msgstr ""
+
+#: lib/app.php:34
+msgid "1=highest"
+msgstr ""
+
+#: lib/app.php:38
+msgid "5=medium"
+msgstr ""
+
+#: lib/app.php:42
+msgid "9=lowest"
+msgstr ""
+
+#: lib/app.php:81
+msgid "Empty Summary"
+msgstr ""
+
+#: lib/app.php:93
+msgid "Invalid percent complete"
+msgstr ""
+
+#: lib/app.php:107
+msgid "Invalid priority"
+msgstr ""
+
+#: templates/tasks.php:3
+msgid "Add Task"
+msgstr ""
+
+#: templates/tasks.php:4
+msgid "Order Due"
+msgstr ""
+
+#: templates/tasks.php:5
+msgid "Order List"
+msgstr ""
+
+#: templates/tasks.php:6
+msgid "Order Complete"
+msgstr ""
+
+#: templates/tasks.php:7
+msgid "Order Location"
+msgstr ""
+
+#: templates/tasks.php:8
+msgid "Order Priority"
+msgstr ""
+
+#: templates/tasks.php:9
+msgid "Order Label"
+msgstr ""
+
+#: templates/tasks.php:16
+msgid "Loading tasks..."
+msgstr ""
+
+#: templates/tasks.php:20
+msgid "Important"
+msgstr ""
+
+#: templates/tasks.php:23
+msgid "More"
+msgstr ""
+
+#: templates/tasks.php:26
+msgid "Less"
+msgstr ""
+
+#: templates/tasks.php:29
+msgid "Delete"
+msgstr ""
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
new file mode 100644
index 00000000000..d84e081d11d
--- /dev/null
+++ b/l10n/zh_TW/user_ldap.po
@@ -0,0 +1,164 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Help"
+msgstr ""
diff --git a/l10n/zh_TW/user_migrate.po b/l10n/zh_TW/user_migrate.po
new file mode 100644
index 00000000000..005fbe5e715
--- /dev/null
+++ b/l10n/zh_TW/user_migrate.po
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: js/export.js:14 js/export.js:20
+msgid "Export"
+msgstr ""
+
+#: js/export.js:19
+msgid "Something went wrong while the export file was being generated"
+msgstr ""
+
+#: js/export.js:19
+msgid "An error has occurred"
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Export your user account"
+msgstr ""
+
+#: templates/settings.php:3
+msgid ""
+"This will create a compressed file that contains your ownCloud account."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Import user account"
+msgstr ""
+
+#: templates/settings.php:15
+msgid "ownCloud User Zip"
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Import"
+msgstr ""
diff --git a/l10n/zh_TW/user_openid.po b/l10n/zh_TW/user_openid.po
new file mode 100644
index 00000000000..ca26a19dbf3
--- /dev/null
+++ b/l10n/zh_TW/user_openid.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: templates/nomode.php:12
+msgid "This is an OpenID server endpoint. For more information, see "
+msgstr ""
+
+#: templates/nomode.php:14
+msgid "Identity: <b>"
+msgstr ""
+
+#: templates/nomode.php:15
+msgid "Realm: <b>"
+msgstr ""
+
+#: templates/nomode.php:16
+msgid "User: <b>"
+msgstr ""
+
+#: templates/nomode.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/nomode.php:22
+msgid "Error: <b>No user Selected"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "you can authenticate to other sites with this address"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Authorized OpenID provider"
+msgstr ""
+
+#: templates/settings.php:6
+msgid "Your address at Wordpress, Identi.ca, &hellip;"
+msgstr ""
diff --git a/lib/backgroundjob/queuedtask.php b/lib/backgroundjob/queuedtask.php
index da5d4ddc694..68ba97c1e39 100644
--- a/lib/backgroundjob/queuedtask.php
+++ b/lib/backgroundjob/queuedtask.php
@@ -81,9 +81,9 @@ class OC_BackgroundJob_QueuedTask{
 	 * @param $parameters all useful data as text
 	 * @return id of task
 	 */
-	public static function add( $task, $klass, $method, $parameters ){
+	public static function add( $app, $klass, $method, $parameters ){
 		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*queuedtasks (app, klass, method, parameters) VALUES(?,?,?,?)' );
-		$result = $stmt->execute(array($app, $klass, $method, $parameters, time));
+		$result = $stmt->execute(array($app, $klass, $method, $parameters ));
 
 		return OC_DB::insertid();
 	}
diff --git a/lib/base.php b/lib/base.php
index 3abfdb35668..fb49e9e6706 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -180,25 +180,11 @@ class OC{
 
 	public static function checkInstalled() {
 		// Redirect to installer if not installed
-		if (!OC_Config::getValue('installed', false)) {
-			if (OC::$SUBURI != '/index.php') {
-				if(!OC::$CLI){
-					$url = 'http://'.$_SERVER['SERVER_NAME'].OC::$WEBROOT.'/index.php';
-					header("Location: $url");
-				}
-				exit();
-			}
-			// Check for autosetup:
-			$autosetup_file = OC::$SERVERROOT."/config/autoconfig.php";
-			if( file_exists( $autosetup_file )){
-				OC_Log::write('core','Autoconfig file found, setting up owncloud...', OC_Log::INFO);
-				include( $autosetup_file );
-				$_POST['install'] = 'true';
-				$_POST = array_merge ($_POST, $AUTOCONFIG);
-				unlink($autosetup_file);
+		if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') {
+			if(!OC::$CLI){
+				$url = 'http://'.$_SERVER['SERVER_NAME'].OC::$WEBROOT.'/index.php';
+				header("Location: $url");
 			}
-			OC_Util::addScript('setup');
-			require_once('setup.php');
 			exit();
 		}
 	}
@@ -344,10 +330,10 @@ class OC{
 		stream_wrapper_register('static', 'OC_StaticStreamWrapper');
 		stream_wrapper_register('close', 'OC_CloseStreamWrapper');
 
-		self::initTemplateEngine();
 		self::checkInstalled();
 		self::checkSSL();
 		self::initSession();
+		self::initTemplateEngine();
 		self::checkUpgrade();
 
 		$errors=OC_Util::checkServer();
@@ -378,6 +364,7 @@ class OC{
 
 		// Check for blacklisted files
 		OC_Hook::connect('OC_Filesystem','write','OC_Filesystem','isBlacklisted');
+		OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted');
 
 		//make sure temporary files are cleaned up
 		register_shutdown_function(array('OC_Helper','cleanTmp'));
@@ -416,6 +403,20 @@ class OC{
 	 * @brief Handle the request
 	 */
 	public static function handleRequest() {
+		if (!OC_Config::getValue('installed', false)) {
+			// Check for autosetup:
+			$autosetup_file = OC::$SERVERROOT."/config/autoconfig.php";
+			if( file_exists( $autosetup_file )){
+				OC_Log::write('core','Autoconfig file found, setting up owncloud...',OC_Log::INFO);
+				include( $autosetup_file );
+				$_POST['install'] = 'true';
+				$_POST = array_merge ($_POST, $AUTOCONFIG);
+				unlink($autosetup_file);
+			}
+			OC_Util::addScript('setup');
+			require_once('setup.php');
+			exit();
+		}
 		// Handle WebDAV
 		if($_SERVER['REQUEST_METHOD']=='PROPFIND'){
 			header('location: '.OC_Helper::linkToRemote('webdav'));
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 47626c05ae2..6cba6b1b547 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -273,7 +273,12 @@ class OC_Filesystem{
 	*/
 	static private function createStorage($class,$arguments){
 		if(class_exists($class)){
-			return new $class($arguments);
+			try {
+				return new $class($arguments);
+			} catch (Exception $exception) {
+				OC_Log::write('core', $exception->getMessage(), OC_Log::ERROR);
+				return false;
+			}
 		}else{
 			OC_Log::write('core','storage backend '.$class.' not found',OC_Log::ERROR);
 			return false;
@@ -363,13 +368,21 @@ class OC_Filesystem{
 	
 	/**
 	 * checks if a file is blacklsited for storage in the filesystem
+	 * Listens to write and rename hooks
 	 * @param array $data from hook
 	 */
 	static public function isBlacklisted($data){
 		$blacklist = array('.htaccess');
-		$filename = strtolower(basename($data['path']));
-		if(in_array($filename,$blacklist)){
-			$data['run'] = false;	
+		if (isset($data['path'])) {
+			$path = $data['path'];
+		} else if (isset($data['newpath'])) {
+			$path = $data['newpath'];
+		}
+		if (isset($path)) {
+			$filename = strtolower(basename($path));
+			if (in_array($filename, $blacklist)) {
+				$data['run'] = false;
+			}
 		}
 	}
 	
@@ -481,6 +494,28 @@ class OC_Filesystem{
 		}
 		OC_Connector_Sabre_Node::removeETagPropertyForPath($path);
 	}
+
+	public static function normalizePath($path){
+		//no windows style slashes
+		$path=str_replace('\\','/',$path);
+		//add leading slash
+		if($path[0]!=='/'){
+			$path='/'.$path;
+		}
+		//remove trainling slash
+		if(strlen($path)>1 and substr($path,-1,1)==='/'){
+			$path=substr($path,0,-1);
+		}
+		//remove duplicate slashes
+		while(strpos($path,'//')!==false){
+			$path=str_replace('//','/',$path);
+		}
+		//normalize unicode if possible
+		if(class_exists('Normalizer')){
+			$path=Normalizer::normalize($path);
+		}
+		return $path;
+	}
 }
 OC_Hook::connect('OC_Filesystem','post_write', 'OC_Filesystem','removeETagHook');
 OC_Hook::connect('OC_Filesystem','post_delete','OC_Filesystem','removeETagHook');
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index faf3f0bd4cc..9d85befdc8c 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -54,10 +54,9 @@ class OC_FilesystemView {
 		if($path[0]!=='/'){
 			$path='/'.$path;
 		}
-		return $this->fakeRoot.$path;
+		return OC_Filesystem::normalizePath($this->fakeRoot.$path);
 	}
-
-
+	
 	/**
 	* change the root to a fake toor
 	* @param  string  fakeRoot
@@ -104,7 +103,12 @@ class OC_FilesystemView {
 		if(strpos($path, $this->fakeRoot)!==0) {
 			return null;
 		}else{
-			return substr($path, strlen($this->fakeRoot));
+			$path=substr($path, strlen($this->fakeRoot));
+			if(strlen($path)===0){
+				return '/';
+			}else{
+				return $path;
+			}
 		}
 	}
 
diff --git a/lib/group.php b/lib/group.php
index 7b137f0f8f1..72cf5dc89af 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -237,10 +237,10 @@ class OC_Group {
 	 *
 	 * Returns a list with all groups
 	 */
-	public static function getGroups(){
-		$groups=array();
-		foreach(self::$_usedBackends as $backend){
-			$groups=array_merge($backend->getGroups(),$groups);
+	public static function getGroups($search = '', $limit = -1, $offset = 0) {
+		$groups = array();
+		foreach (self::$_usedBackends as $backend) {
+			$groups = array_merge($backend->getGroups($search, $limit, $offset), $groups);
 		}
 		asort($groups);
 		return $groups;
@@ -264,10 +264,10 @@ class OC_Group {
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
 	 */
-	public static function usersInGroup($gid){
+	public static function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		$users=array();
 		foreach(self::$_usedBackends as $backend){
-			$users=array_merge($backend->usersInGroup($gid),$users);
+			$users = array_merge($backend->usersInGroup($gid, $search, $limit, $offset), $users);
 		}
 		return $users;
 	}
@@ -277,10 +277,11 @@ class OC_Group {
 	 * @param array $gids
 	 * @returns array with user ids
 	 */
-	public static function usersInGroups($gids){
+	public static function usersInGroups($gids, $search = '', $limit = -1, $offset = 0) {
 		$users = array();
-		foreach($gids as $gid){
-			$users = array_merge(array_diff(self::usersInGroup($gid), $users), $users);
+		foreach ($gids as $gid) {
+			// TODO Need to apply limits to groups as total
+			$users = array_merge(array_diff(self::usersInGroup($gid, $search, $limit, $offset), $users), $users);
 		}
 		return $users;
 	}
diff --git a/lib/group/backend.php b/lib/group/backend.php
index ebc078f152a..4c7d09bcb16 100644
--- a/lib/group/backend.php
+++ b/lib/group/backend.php
@@ -105,7 +105,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 	 *
 	 * Returns a list with all groups
 	 */
-	public function getGroups(){
+	public function getGroups($search = '', $limit = -1, $offset = 0) {
 		return array();
 	}
 
@@ -122,7 +122,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
 	 */
-	public function usersInGroup($gid){
+	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		return array();
 	}
 
diff --git a/lib/group/database.php b/lib/group/database.php
index 2770ec185c4..1cb4171f49f 100644
--- a/lib/group/database.php
+++ b/lib/group/database.php
@@ -164,15 +164,17 @@ class OC_Group_Database extends OC_Group_Backend {
 	 *
 	 * Returns a list with all groups
 	 */
-	public function getGroups(){
-		$query = OC_DB::prepare( "SELECT gid FROM `*PREFIX*groups`" );
-		$result = $query->execute();
-
+	public function getGroups($search = '', $limit = -1, $offset = 0) {
+		if ($limit == -1) {
+			$query = OC_DB::prepare('SELECT gid FROM *PREFIX*groups WHERE gid LIKE ?');
+		} else {
+			$query = OC_DB::prepare('SELECT gid FROM *PREFIX*groups WHERE gid LIKE ? LIMIT '.$limit.' OFFSET '.$offset);
+		}
+		$result = $query->execute(array($search.'%'));
 		$groups = array();
-		while( $row = $result->fetchRow()){
-			$groups[] = $row["gid"];
+		while ($row = $result->fetchRow()) {
+			$groups[] = $row['gid'];
 		}
-
 		return $groups;
 	}
 
@@ -180,12 +182,16 @@ class OC_Group_Database extends OC_Group_Backend {
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
 	 */
-	public function usersInGroup($gid){
-		$query=OC_DB::prepare('SELECT uid FROM *PREFIX*group_user WHERE gid=?');
-		$users=array();
-		$result=$query->execute(array($gid));
-		while($row=$result->fetchRow()){
-			$users[]=$row['uid'];
+	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
+		if ($limit == -1) {
+			$query = OC_DB::prepare('SELECT uid FROM *PREFIX*group_user WHERE gid = ? AND uid LIKE ?');
+		} else {
+			$query = OC_DB::prepare('SELECT uid FROM *PREFIX*group_user WHERE gid = ? AND uid LIKE ? LIMIT '.$limit.' OFFSET '.$offset);
+		}
+		$result = $query->execute(array($gid, $search.'%'));
+		$users = array();
+		while ($row = $result->fetchRow()) {
+			$users[] = $row['uid'];
 		}
 		return $users;
 	}
diff --git a/lib/group/dummy.php b/lib/group/dummy.php
index 1243891023f..51eca28f3f4 100644
--- a/lib/group/dummy.php
+++ b/lib/group/dummy.php
@@ -141,7 +141,7 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	 *
 	 * Returns a list with all groups
 	 */
-	public function getGroups(){
+	public function getGroups($search = '', $limit = -1, $offset = 0) {
 		return array_keys($this->groups);
 	}
 
@@ -149,7 +149,7 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
 	 */
-	public function usersInGroup($gid){
+	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		if(isset($this->groups[$gid])){
 			return $this->groups[$gid];
 		}else{
diff --git a/lib/group/example.php b/lib/group/example.php
index 9c9ece5ac77..76d12629763 100644
--- a/lib/group/example.php
+++ b/lib/group/example.php
@@ -91,7 +91,7 @@ abstract class OC_Group_Example {
 	 *
 	 * Returns a list with all groups
 	 */
-	abstract public static function getGroups();
+	abstract public static function getGroups($search = '', $limit = -1, $offset = 0);
 
 	/**
 	 * check if a group exists
@@ -104,6 +104,6 @@ abstract class OC_Group_Example {
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
 	 */
-	abstract public static function usersInGroup($gid);
+	abstract public static function usersInGroup($gid, $search = '', $limit = -1, $offset = 0);
 
 }
diff --git a/lib/group/interface.php b/lib/group/interface.php
index 7cca6061e10..12cc07a5374 100644
--- a/lib/group/interface.php
+++ b/lib/group/interface.php
@@ -58,7 +58,7 @@ interface OC_Group_Interface {
 	 *
 	 * Returns a list with all groups
 	 */
-	public function getGroups();
+	public function getGroups($search = '', $limit = -1, $offset = 0);
 
 	/**
 	 * check if a group exists
@@ -71,6 +71,6 @@ interface OC_Group_Interface {
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
 	 */
-	public function usersInGroup($gid);
+	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0);
 
 }
\ No newline at end of file
diff --git a/lib/l10n/th_TH.php b/lib/l10n/th_TH.php
new file mode 100644
index 00000000000..cb2610fa204
--- /dev/null
+++ b/lib/l10n/th_TH.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "ช่วยเหลือ",
+"Personal" => "ส่วนตัว",
+"Settings" => "ตั้งค่า",
+"Users" => "ผู้ใช้งาน",
+"Apps" => "แอปฯ",
+"Admin" => "ผู้ดูแล",
+"ZIP download is turned off." => "คุณสมบัติการดาวน์โหลด zip ถูกปิดการใช้งานไว้",
+"Files need to be downloaded one by one." => "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น",
+"Back to Files" => "กลับไปที่ไฟล์",
+"Selected files too large to generate zip file." => "ไฟล์ที่เลือกมีขนาดใหญ่เกินกว่าที่จะสร้างเป็นไฟล์ zip",
+"Application is not enabled" => "แอพพลิเคชั่นดังกล่าวยังไม่ได้เปิดใช้งาน",
+"Authentication error" => "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
+"Token expired. Please reload page." => "รหัสยืนยันความถูกต้องหมดอายุแล้ว กรุณาโหลดหน้าเว็บใหม่อีกครั้ง",
+"seconds ago" => "วินาทีที่ผ่านมา",
+"1 minute ago" => "1 นาทีมาแล้ว",
+"%d minutes ago" => "%d นาทีที่ผ่านมา",
+"today" => "วันนี้",
+"yesterday" => "เมื่อวานนี้",
+"%d days ago" => "%d วันที่ผ่านมา",
+"last month" => "เดือนที่แล้ว",
+"months ago" => "เดือนมาแล้ว",
+"last year" => "ปีที่แล้ว",
+"years ago" => "ปีที่ผ่านมา"
+);
diff --git a/lib/migrate.php b/lib/migrate.php
index 1b6367ed6ec..917d77eaca0 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -322,7 +322,7 @@ class OC_Migrate{
 			$objects = scandir( $path );
 			if( sizeof( $objects ) > 0 ){
 				foreach( $objects as $file ){
-					if( $file == "." || $file == ".." )
+					if( $file == "." || $file == ".." || $file == ".htaccess")
 					continue;
 					// go on
 					if( is_dir( $path . '/' . $file ) ){
diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php
index 72f4557eb1a..834bebb5c3c 100644
--- a/lib/public/backgroundjob.php
+++ b/lib/public/backgroundjob.php
@@ -100,8 +100,8 @@ class BackgroundJob {
 	 * @param $parameters all useful data as text
 	 * @return id of task
 	 */
-	public static function addQueuedTask( $task, $klass, $method, $parameters ){
-		return \OC_BackgroundJob_QueuedTask::add( $task, $klass, $method, $parameters );
+	public static function addQueuedTask( $app, $klass, $method, $parameters ){
+		return \OC_BackgroundJob_QueuedTask::add( $app, $klass, $method, $parameters );
 	}
 
 	/**
diff --git a/lib/public/user.php b/lib/public/user.php
index 713e366b968..2fa599488a7 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -51,7 +51,7 @@ class User {
 	 *
 	 * Get a list of all users.
 	 */
-	public static function getUsers(){
+	public static function getUsers($search = '', $limit = -1, $offset = 0) {
 		return \OC_USER::getUsers();
 	}
 
diff --git a/lib/user.php b/lib/user.php
index 49a0a2a10ce..cbd1400844d 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -338,12 +338,12 @@ class OC_User {
 	 *
 	 * Get a list of all users.
 	 */
-	public static function getUsers(){
-		$users=array();
-		foreach(self::$_usedBackends as $backend){
-			$backendUsers=$backend->getUsers();
-			if(is_array($backendUsers)){
-				$users=array_merge($users,$backendUsers);
+	public static function getUsers($search = '', $limit = -1, $offset = 0) {
+		$users = array();
+		foreach (self::$_usedBackends as $backend) {
+			$backendUsers = $backend->getUsers($search, $limit, $offset);
+			if (is_array($backendUsers)) {
+				$users = array_merge($users, $backendUsers);
 			}
 		}
 		asort($users);
diff --git a/lib/user/backend.php b/lib/user/backend.php
index daa942d261c..f67908cdac0 100644
--- a/lib/user/backend.php
+++ b/lib/user/backend.php
@@ -97,7 +97,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	*
 	* Get a list of all users.
 	*/
-	public function getUsers(){
+	public function getUsers($search = '', $limit = -1, $offset = 0) {
 		return array();
 	}
 
diff --git a/lib/user/database.php b/lib/user/database.php
index cc27b3ddbfd..1deed517610 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -154,13 +154,16 @@ class OC_User_Database extends OC_User_Backend {
 	 *
 	 * Get a list of all users.
 	 */
-	public function getUsers(){
-		$query = OC_DB::prepare( "SELECT uid FROM *PREFIX*users" );
-		$result = $query->execute();
-
-		$users=array();
-		while( $row = $result->fetchRow()){
-			$users[] = $row["uid"];
+	public function getUsers($search = '', $limit = -1, $offset = 0) {
+		if ($limit == -1) {
+			$query = OC_DB::prepare('SELECT uid FROM *PREFIX*users WHERE uid LIKE ?');
+		} else {
+			$query = OC_DB::prepare('SELECT uid FROM *PREFIX*users WHERE uid LIKE ? LIMIT '.$limit.' OFFSET '.$offset);
+		}
+		$result = $query->execute(array($search.'%'));
+		$users = array();
+		while ($row = $result->fetchRow()) {
+			$users[] = $row['uid'];
 		}
 		return $users;
 	}
diff --git a/lib/user/dummy.php b/lib/user/dummy.php
index a946d4e6214..da3edfb2df4 100644
--- a/lib/user/dummy.php
+++ b/lib/user/dummy.php
@@ -100,7 +100,7 @@ class OC_User_Dummy extends OC_User_Backend {
 		*
 		* Get a list of all users.
 		*/
-	public function getUsers(){
+	public function getUsers($search = '', $limit = -1, $offset = 0) {
 		return array_keys($this->users);
 	}
 
diff --git a/lib/user/interface.php b/lib/user/interface.php
index dc3685dc20d..a4903898fb1 100644
--- a/lib/user/interface.php
+++ b/lib/user/interface.php
@@ -48,7 +48,7 @@ interface OC_User_Interface {
 	*
 	* Get a list of all users.
 	*/
-	public function getUsers();
+	public function getUsers($search = '', $limit = -1, $offset = 0);
 
 	/**
 	* @brief check if a user exists
diff --git a/lib/util.php b/lib/util.php
index 732acbb9205..0ef030e4401 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -66,7 +66,7 @@ class OC_Util {
 	 * @return array
 	 */
 	public static function getVersion(){
-		return array(4,81,2);
+		return array(4,81,3);
 	}
 
 	/**
diff --git a/settings/ajax/setbackgroundjobsmode.php b/settings/ajax/setbackgroundjobsmode.php
index 0ff14376e6e..b0292f3b106 100644
--- a/settings/ajax/setbackgroundjobsmode.php
+++ b/settings/ajax/setbackgroundjobsmode.php
@@ -26,6 +26,9 @@ require_once('../../lib/base.php');
 OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
-OC_Appconfig::setValue( 'core', 'backgroundjob_mode', $_POST['mode'] );
+$mode = isset( $_POST['mode'] ) ? $_POST['mode'] : '';
+if( $mode == "none" || $mode == "ajax" || $mode == "webcron" || $mode == "cron" ){
+	OC_Appconfig::setValue( 'core', 'backgroundjobs_mode', $_POST['mode'] );
+}
 
 echo 'true';
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
new file mode 100644
index 00000000000..b89b8c55ef0
--- /dev/null
+++ b/settings/ajax/userlist.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Michael Gapczynski
+ * @copyright 2012 Michael Gapczynski mtgap@owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+require_once '../../lib/base.php';
+
+OC_JSON::callCheck();
+OC_JSON::checkSubAdminUser();
+if (isset($_GET['offset'])) {
+	$offset = $_GET['offset'];
+} else {
+	$offset = 0;
+}
+$users = array();
+if (OC_Group::inGroup(OC_User::getUser(), 'admin')) {
+	$batch = OC_User::getUsers('', 10, $offset);
+	foreach ($batch as $user) {
+		$users[] = array('name' => $user, 'groups' => join(', ', OC_Group::getUserGroups($user)), 'subadmin' => join(', ',OC_SubAdmin::getSubAdminsGroups($user)), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
+	}
+} else {
+	$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
+	$batch = OC_Group::usersInGroups($groups, '', 10, $offset);
+	foreach ($batch as $user) {
+		$users[] = array('name' => $user, 'groups' => join(', ', OC_Group::getUserGroups($user)), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
+	}
+}
+OC_JSON::success(array('data' => $users));
\ No newline at end of file
diff --git a/settings/js/users.js b/settings/js/users.js
index 5a3820b74d3..29f70f24dff 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -22,10 +22,6 @@ UserList={
 		// Set undo flag
 		UserList.deleteCanceled = false;
 		
-		// Hide user in table to reflect deletion
-		$(this).parent().parent().hide();
-		$('tr').filterAttr( 'data-uid', UserList.deleteUid ).hide();
-		
 		// Provide user with option to undo
 		$('#notification').html(t('users', 'deleted')+' '+uid+'<span class="undo">'+t('users', 'undo')+'</span>');
 		$('#notification').data('deleteuser',true);
@@ -66,26 +62,92 @@ UserList={
 				}
 			});
  		}
-	}
-}
+	},
 
-$(document).ready(function(){
-	function setQuota(uid,quota,ready){
-		$.post(
-			OC.filePath('settings','ajax','setquota.php'),
-			{username:uid,quota:quota},
-			function(result){
-				if(ready){
-					ready(result.data.quota);
+	add:function(username, groups, subadmin, quota, sort) {
+		var tr = $('tbody tr').first().clone();
+		tr.data('uid', username);
+		tr.find('td.name').text(username);
+		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups">');
+		groupsSelect.data('username', username);
+		groupsSelect.data('userGroups', groups);
+		tr.find('td.groups').empty();
+		if (tr.find('td.subadmins').length > 0) {
+			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('files', 'SubAdmin') + '">');
+			subadminSelect.data('username', username);
+			subadminSelect.data('userGroups', groups);
+			subadminSelect.data('subadmin', subadmin);
+			tr.find('td.subadmins').empty();
+		}
+		var allGroups = String($('#content table').data('groups')).split(', ');
+		$.each(allGroups, function(i, group) {
+			groupsSelect.append($('<option value="'+group+'">'+group+'</option>'));
+			if (typeof subadminSelect !== 'undefined' && group != 'admin') {
+				subadminSelect.append($('<option value="'+group+'">'+group+'</option>'));
+			}
+		});
+		tr.find('td.groups').append(groupsSelect);
+		UserList.applyMultiplySelect(groupsSelect);
+		tr.find('td.subadmins').append(subadminSelect);
+		UserList.applyMultiplySelect(subadminSelect);
+		if (tr.find('td.remove img').length == 0 && OC.currentUser != username) {
+			tr.find('td.remove').append($('<img alt="Delete" title="'+t('settings','Delete')+'" class="svg action" src="'+OC.imagePath('core','actions/delete')+'"/>'));
+		} else if (OC.currentUser == username) {
+			tr.find('td.remove a').remove();
+		}
+		var quotaSelect = tr.find('select.quota-user');
+		if (quota == 'default') {
+			quotaSelect.find('option').attr('selected', null);
+			quotaSelect.find('option').first().attr('selected', 'selected');
+			quotaSelect.data('previous', 'default');
+		} else {
+			if (quotaSelect.find('option[value="'+quota+'"]').length > 0) {
+				quotaSelect.find('option[value="'+quota+'"]').attr('selected', 'selected');
+			} else {
+				quotaSelect.append('<option value="'+quota+'" selected="selected">'+quota+'</option>');
+			}
+		}
+		var added = false;
+		if (sort) {
+			username = username.toLowerCase();
+			$('tbody tr').each(function() {
+				if (username < $(this).data('uid').toLowerCase()) {
+					$(tr).insertBefore($(this));
+					added = true;
+					return false;
 				}
+			});
+		} 
+		if (!added) {
+			$(tr).appendTo('tbody');
+		}
+		return tr;
+	},
+
+	update:function() {
+		if (typeof UserList.offset === 'undefined') {
+			UserList.offset = $('tbody tr').length;
+		}
+		$.get(OC.filePath('settings', 'ajax', 'userlist.php'), { offset: UserList.offset }, function(result) {
+			if (result.status === 'success') {
+				$.each(result.data, function(index, user) {
+					var tr = UserList.add(user.name, user.groups, user.subadmin, user.quota, false);
+					UserList.offset++;
+					if (index == 9) {
+						$(tr).bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+							$(this).unbind(event);
+							UserList.update();
+						});
+					}
+				});
 			}
-		);
-	}
-	
-	function applyMultiplySelect(element){
+		});
+	},
+
+	applyMultiplySelect:function(element) {
 		var checked=[];
 		var user=element.data('username');
-		if($(element).attr('class') == 'groupsselect'){		
+		if($(element).attr('class') == 'groupsselect'){
 			if(element.data('userGroups')){
 				checked=String(element.data('userGroups')).split(', ');
 			}
@@ -131,9 +193,9 @@ $(document).ready(function(){
 				minWidth: 100,
 			});
 		}
-		if($(element).attr('class') == 'subadminsselect'){	
+		if($(element).attr('class') == 'subadminsselect'){
 			if(element.data('subadmin')){
-				checked=element.data('subadmin').split(', ');
+				checked=String(element.data('subadmin')).split(', ');
 			}
 			var checkHandeler=function(group){
 				if(group=='admin'){
@@ -166,17 +228,37 @@ $(document).ready(function(){
 			});
 		}
 	}
+}
+
+$(document).ready(function(){
+
+	$('tbody tr:last').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+		UserList.update();
+	});
+
+	function setQuota(uid,quota,ready){
+		$.post(
+			OC.filePath('settings','ajax','setquota.php'),
+			{username:uid,quota:quota},
+			function(result){
+				if(ready){
+					ready(result.data.quota);
+				}
+			}
+		);
+	}
+	
+	
 	$('select[multiple]').each(function(index,element){
-		applyMultiplySelect($(element));
+		UserList.applyMultiplySelect($(element));
 	});
 	
 	$('td.remove>a').live('click',function(event){
-		
-		var uid = $(this).parent().parent().data('uid');
-		
+		var row = $(this).parent().parent();
+		var uid = $(row).data('uid');
+		$(row).hide();
 		// Call function for handling delete/undo
-		UserList.do_delete( uid );
-		
+		UserList.do_delete(uid);
 	});
 	
 	$('td.password>img').live('click',function(event){
@@ -297,45 +379,8 @@ $(document).ready(function(){
 			function(result){
 				if(result.status!='success'){
 					OC.dialogs.alert(result.data.message, 'Error creating user');
-				}
-				else {
-					groups = result.data.groups;
-					var tr=$('#content table tbody tr').first().clone();
-					tr.attr('data-uid',username);
-					tr.find('td.name').text(username);
-					var select=$('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups">');
-					var subadminselect=$('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('files', 'SubAdmin') + '">');
-					select.data('username',username);
-					select.data('userGroups',groups);
-					subadminselect.data('username',username);
-					subadminselect.data('userGroups',groups);
-					tr.find('td.groups').empty();
-					tr.find('td.subadmins').empty();
-					var allGroups=$('#content table').data('groups').split(', ');
-					for(var i=0;i<groups.length;i++){
-						if(allGroups.indexOf(groups[i])==-1){
-							allGroups.push(groups[i]);
-						}
-					}
-					$.each(allGroups,function(i,group){
-						select.append($('<option value="'+group+'">'+group+'</option>'));
-						if(group != 'admin'){
-							subadminselect.append($('<option value="'+group+'">'+group+'</option>'));
-						}
-					});
-					tr.find('td.groups').append(select);
-					tr.find('td.subadmins').append(subadminselect);
-					if(tr.find('td.remove img').length==0){
-						tr.find('td.remove').append($('<img alt="Delete" title="'+t('settings','Delete')+'" class="svg action" src="'+OC.imagePath('core','actions/delete')+'"/>'));
-					}
-					applyMultiplySelect(select);
-					applyMultiplySelect(subadminselect);
-					
-					$('#content table tbody').last().append(tr);
-
-					tr.find('select.quota-user option').attr('selected',null);
-					tr.find('select.quota-user option').first().attr('selected','selected');
-					tr.find('select.quota-user').data('previous','default');
+				} else {
+					UserList.add(username, result.data.groups, null, 'default', true);
 				}
 			}
 		);
@@ -343,9 +388,12 @@ $(document).ready(function(){
 	// Handle undo notifications
 	$('#notification').hide();
 	$('#notification .undo').live('click', function() {
-		if($('#notification').data('deleteuser'))
-		{
-			$( 'tr' ).filterAttr( 'data-uid', UserList.deleteUid ).show();
+		if($('#notification').data('deleteuser')) {
+			$('tbody tr').each(function(index, row) {
+				if ($(row).data('uid') == UserList.deleteUid) {
+					$(row).show();
+				}
+			});
 			UserList.deleteCanceled=true;
 			UserList.deleteFiles=null;
 		}
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index c868bc278c3..0bb70e04381 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -12,9 +12,13 @@
 "Saving..." => "S'està desant...",
 "__language_name__" => "Català",
 "Security Warning" => "Avís de seguretat",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "executa una tasca en carregar cada pàgina",
+"cron.php is registered at a webcron service" => "cron.php està registrat en un servei web cron",
+"use systems cron service" => "usa el servei cron del sistema",
 "Log" => "Registre",
 "More" => "Més",
-"Add your App" => "Afegeiu la vostra aplicació",
+"Add your App" => "Afegiu la vostra aplicació",
 "Select an App" => "Seleccioneu una aplicació",
 "See application page at apps.owncloud.com" => "Mireu la pàgina d'aplicacions a apps.owncloud.com",
 "-licensed" => "- amb llicència",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 148a8becc9b..569abd58cba 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,13 +1,17 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Kunne ikke indlæse listen fra App Store",
 "Email saved" => "Email adresse gemt",
 "Invalid email" => "Ugyldig email adresse",
 "OpenID Changed" => "OpenID ændret",
 "Invalid request" => "Ugyldig forespørgsel",
+"Authentication error" => "Adgangsfejl",
 "Language changed" => "Sprog ændret",
+"Error" => "Fejl",
 "Disable" => "Deaktiver",
 "Enable" => "Aktiver",
 "Saving..." => "Gemmer...",
 "__language_name__" => "Dansk",
+"Security Warning" => "Sikkerhedsadvarsel",
 "Log" => "Log",
 "More" => "Mere",
 "Add your App" => "Tilføj din App",
@@ -43,6 +47,7 @@
 "Create" => "Ny",
 "Default Quota" => "Standard kvote",
 "Other" => "Andet",
+"SubAdmin" => "SubAdmin",
 "Quota" => "Kvote",
 "Delete" => "Slet"
 );
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index e0cb1259537..05e227cbc2d 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -12,6 +12,10 @@
 "Saving..." => "Speichern...",
 "__language_name__" => "Deutsch",
 "Security Warning" => "Sicherheitshinweis",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "Führe eine Aufgabe pro geladener Seite aus.",
+"cron.php is registered at a webcron service" => "cron.php ist beim Webcron-Service registriert",
+"use systems cron service" => "Nutze System-Cron-Service",
 "Log" => "Log",
 "More" => "Mehr",
 "Add your App" => "Füge deine App hinzu",
@@ -36,10 +40,10 @@
 "show" => "zeigen",
 "Change password" => "Passwort ändern",
 "Email" => "E-Mail",
-"Your email address" => "Ihre E-Mail Adresse",
-"Fill in an email address to enable password recovery" => "Trage eine E-Mail Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
+"Your email address" => "Ihre E-Mail-Adresse",
+"Fill in an email address to enable password recovery" => "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
 "Language" => "Sprache",
-"Help translate" => "Hilf bei der Übersetzung!",
+"Help translate" => "Hilf bei der Übersetzung",
 "use this address to connect to your ownCloud in your file manager" => "Benutze diese Adresse, um deine ownCloud mit deinem Dateimanager zu verbinden.",
 "Name" => "Name",
 "Password" => "Passwort",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 6e70d923b36..55a7482d249 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -1,10 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Ne eblis ŝargi liston el aplikaĵovendejo",
 "Email saved" => "La retpoŝtadreso konserviĝis",
 "Invalid email" => "Nevalida retpoŝtadreso",
 "OpenID Changed" => "La agordo de OpenID estas ŝanĝita",
 "Invalid request" => "Nevalida peto",
 "Authentication error" => "Aŭtentiga eraro",
 "Language changed" => "La lingvo estas ŝanĝita",
+"Error" => "Eraro",
 "Disable" => "Malkapabligi",
 "Enable" => "Kapabligi",
 "Saving..." => "Konservante...",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 687c21259f0..8da36b421a3 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,10 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Imposible cargar la lista desde App Store",
 "Email saved" => "Correo salvado",
 "Invalid email" => "Correo Incorrecto",
 "OpenID Changed" => "OpenID cambiado",
 "Invalid request" => "Solicitud no válida",
 "Authentication error" => "Error de autenticación",
 "Language changed" => "Idioma cambiado",
+"Error" => "Error",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
 "Saving..." => "Salvando..",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 819fc0a2c3b..48a6e14ebb7 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,13 +1,17 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Nem tölthető le a lista az App Store-ból",
 "Email saved" => "Email mentve",
 "Invalid email" => "Hibás email",
 "OpenID Changed" => "OpenID megváltozott",
 "Invalid request" => "Érvénytelen kérés",
+"Authentication error" => "Hitelesítési hiba",
 "Language changed" => "A nyelv megváltozott",
+"Error" => "Hiba",
 "Disable" => "Letiltás",
 "Enable" => "Engedélyezés",
 "Saving..." => "Mentés...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Biztonsági figyelmeztetés",
 "Log" => "Napló",
 "More" => "Tovább",
 "Add your App" => "App hozzáadása",
@@ -43,6 +47,7 @@
 "Create" => "Létrehozás",
 "Default Quota" => "Alapértelmezett kvóta",
 "Other" => "Egyéb",
+"SubAdmin" => "al-Admin",
 "Quota" => "Kvóta",
 "Delete" => "Törlés"
 );
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 62378377e85..bc02a7a8337 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -12,6 +12,10 @@
 "Saving..." => "Salvataggio in corso...",
 "__language_name__" => "Italiano",
 "Security Warning" => "Avviso di sicurezza",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "esegui un'attività con ogni pagina caricata",
+"cron.php is registered at a webcron service" => "cron.php è registrato a un servizio webcron",
+"use systems cron service" => "usa il servizio cron di sistema",
 "Log" => "Registro",
 "More" => "Altro",
 "Add your App" => "Aggiungi la tua applicazione",
@@ -29,7 +33,7 @@
 "of the available" => "su un totale di",
 "Desktop and Mobile Syncing Clients" => "Client di sincronizzazione desktop e mobile",
 "Download" => "Scaricamento",
-"Your password got changed" => "La tua password è stata cambiata",
+"Your password got changed" => "La tua password è stata cambiat",
 "Unable to change your password" => "Modifica password non riuscita",
 "Current password" => "Password attuale",
 "New password" => "Nuova password",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index f215e5b9108..ae1ebaf9912 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -1,10 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "アプリストアからリストをロードできません",
 "Email saved" => "メールアドレスを保存しました",
 "Invalid email" => "無効なメールアドレス",
 "OpenID Changed" => "OpenIDが変更されました",
 "Invalid request" => "無効なリクエストです",
 "Authentication error" => "認証エラー",
 "Language changed" => "言語が変更されました",
+"Error" => "エラー",
 "Disable" => "無効",
 "Enable" => "有効",
 "Saving..." => "保存中...",
@@ -45,6 +47,7 @@
 "Create" => "作成",
 "Default Quota" => "デフォルトのクォータサイズ",
 "Other" => "その他",
+"SubAdmin" => "サブ管理者",
 "Quota" => "クオータ",
 "Delete" => "削除"
 );
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 99c6d9d484a..574aa75bbf9 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,15 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Ne morem naložiti seznama iz App Store",
 "Email saved" => "E-poštni naslov je bil shranjen",
 "Invalid email" => "Neveljaven e-poštni naslov",
 "OpenID Changed" => "OpenID je bil spremenjen",
 "Invalid request" => "Neveljaven zahtevek",
 "Authentication error" => "Napaka overitve",
 "Language changed" => "Jezik je bil spremenjen",
+"Error" => "Napaka",
 "Disable" => "Onemogoči",
 "Enable" => "Omogoči",
 "Saving..." => "Shranjevanje...",
 "__language_name__" => "__ime_jezika__",
 "Security Warning" => "Varnostno opozorilo",
+"Cron" => "Periodično opravilo",
+"execute one task with each page loaded" => "izvedi eno nalogo z vsako naloženo stranjo",
+"cron.php is registered at a webcron service" => "cron.php je vpisan na storitev webcron",
+"use systems cron service" => "uporabi sistemski servis za periodična opravila",
 "Log" => "Dnevnik",
 "More" => "Več",
 "Add your App" => "Dodajte vašo aplikacijo",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 2d6798ff29e..6c9386d3aeb 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -1,13 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "ไม่สามารถโหลดรายการจาก App Store ได้",
 "Email saved" => "อีเมลถูกบันทึกแล้ว",
 "Invalid email" => "อีเมลไม่ถูกต้อง",
 "OpenID Changed" => "เปลี่ยนชื่อบัญชี OpenID แล้ว",
 "Invalid request" => "คำร้องขอไม่ถูกต้อง",
+"Authentication error" => "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน",
 "Language changed" => "เปลี่ยนภาษาเรียบร้อยแล้ว",
+"Error" => "ข้อผิดพลาด",
 "Disable" => "ปิดใช้งาน",
 "Enable" => "เปิดใช้งาน",
 "Saving..." => "กำลังบันทึุกข้อมูล...",
 "__language_name__" => "ภาษาไทย",
+"Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "ประมวลผลหนึ่งงานเมื่อโหลดหน้าเว็บแต่ละครั้ง",
+"cron.php is registered at a webcron service" => "cron.php ได้ถูกลงทะเบียนที่บริการ webcron",
+"use systems cron service" => "ใช้บริการ cron จากระบบ",
 "Log" => "บันทึกการเปลี่ยนแปลง",
 "More" => "เพิ่มเติม",
 "Add your App" => "เพิ่มแอปของคุณ",
@@ -43,6 +51,7 @@
 "Create" => "สร้าง",
 "Default Quota" => "โควต้าที่กำหนดไว้เริ่มต้น",
 "Other" => "อื่นๆ",
+"SubAdmin" => "ผู้ดูแลย่อย",
 "Quota" => "พื้นที่",
 "Delete" => "ลบ"
 );
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
new file mode 100644
index 00000000000..cb662c1b646
--- /dev/null
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -0,0 +1,54 @@
+<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "不能从App Store 中加载列表",
+"Email saved" => "Email 保存了",
+"Invalid email" => "非法Email",
+"OpenID Changed" => "OpenID 改变了",
+"Invalid request" => "非法请求",
+"Authentication error" => "认证错误",
+"Language changed" => "语言改变了",
+"Error" => "错误",
+"Disable" => "禁用",
+"Enable" => "启用",
+"Saving..." => "保存中...",
+"__language_name__" => "Chinese",
+"Security Warning" => "安全警告",
+"Cron" => "定时",
+"Log" => "日志",
+"More" => "更多",
+"Add your App" => "添加你的应用程序",
+"Select an App" => "选择一个程序",
+"See application page at apps.owncloud.com" => "在owncloud.com上查看应用程序",
+"-licensed" => "-许可了",
+"by" => "由",
+"Documentation" => "文档",
+"Managing Big Files" => "管理大文件",
+"Ask a question" => "提一个问题",
+"Problems connecting to help database." => "连接到帮助数据库时的问题",
+"Go there manually." => "收到转到.",
+"Answer" => "回答",
+"You use" => "你使用",
+"of the available" => "可用的",
+"Desktop and Mobile Syncing Clients" => "桌面和移动同步客户端",
+"Download" => "下载",
+"Your password got changed" => "你的密码已经改变",
+"Unable to change your password" => "不能改变你的密码",
+"Current password" => "现在的密码",
+"New password" => "新密码",
+"show" => "展示",
+"Change password" => "改变密码",
+"Email" => "Email",
+"Your email address" => "你的email地址",
+"Fill in an email address to enable password recovery" => "输入一个邮箱地址以激活密码恢复功能",
+"Language" => "语言",
+"Help translate" => "帮助翻译",
+"use this address to connect to your ownCloud in your file manager" => "使用这个地址和你的文件管理器连接到你的ownCloud",
+"Name" => "名字",
+"Password" => "密码",
+"Groups" => "组",
+"Create" => "新建",
+"Default Quota" => "默认限额",
+"Other" => "其他的",
+"SubAdmin" => "子专辑",
+"Quota" => "限额",
+"Delete" => "删除"
+);
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 93707394270..9ccab25516c 100755
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -27,14 +27,12 @@ if(!$_['htaccessworking']) {
 
 <fieldset class="personalblock" id="backgroundjobs">
 	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
-	<input type="radio" name="mode" value="none" id="backgroundjobs_none" <?php if( $_['backgroundjobs_mode'] == "none" ){ echo 'checked="checked"'; } ?>>
-	<label for="backgroundjobs_none">None</label><br />
 	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjobs_mode'] == "ajax" ){ echo 'checked="checked"'; } ?>>
-	<label for="backgroundjobs_ajax">AJAX</label><br />
+	<label for="backgroundjobs_ajax" title="<?php echo $l->t("execute one task with each page loaded"); ?>">AJAX</label><br />
 	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjobs_mode'] == "webcron" ){ echo 'checked="checked"'; } ?>>
-	<label for="backgroundjobs_webcron">Webcron</label><br />
+	<label for="backgroundjobs_webcron" title="<?php echo $l->t("cron.php is registered at a webcron service"); ?>">Webcron</label><br />
 	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjobs_mode'] == "cron" ){ echo 'checked="checked"'; } ?>>
-	<label for="backgroundjobs_cron">Cron</label><br />
+	<label for="backgroundjobs_cron" title="<?php echo $l->t("use systems cron service"); ?>">Cron</label><br />
 </fieldset>
 
 <fieldset class="personalblock">
diff --git a/settings/templates/users.php b/settings/templates/users.php
index d8200bf2022..3e9faddadf2 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -18,7 +18,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 </script>
 <div id="controls">
 	<form id="newuser">
-		<input id="newusername" placeholder="<?php echo $l->t('Name')?>" /> <input
+		<input id="newusername" type="text" placeholder="<?php echo $l->t('Name')?>" /> <input
 			type="password" id="newuserpassword"
 			placeholder="<?php echo $l->t('Password')?>" /> <select
 			class="groupsselect"
diff --git a/settings/users.php b/settings/users.php
index e88c4d1d9ce..6f39059757a 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -11,6 +11,8 @@ OC_Util::checkSubAdminUser();
 // We have some javascript foo!
 OC_Util::addScript( 'settings', 'users' );
 OC_Util::addScript( 'core', 'multiselect' );
+// TODO Move script to core
+OC_Util::addScript('contacts', 'jquery.inview');
 OC_Util::addStyle( 'settings', 'settings' );
 OC_App::setActiveNavigationEntry( 'core_users' );
 
@@ -20,11 +22,11 @@ $groups = array();
 $isadmin = OC_Group::inGroup(OC_User::getUser(),'admin')?true:false;
 if($isadmin){
 	$accessiblegroups = OC_Group::getGroups();
-	$accessibleusers = OC_User::getUsers();
+	$accessibleusers = OC_User::getUsers('', 30);
 	$subadmins = OC_SubAdmin::getAllSubAdmins();
 }else{
 	$accessiblegroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
-	$accessibleusers = OC_Group::usersInGroups($accessiblegroups);
+	$accessibleusers = OC_Group::usersInGroups($accessiblegroups, '', 30);
 	$subadmins = false;
 }
 
diff --git a/tests/lib/filesystem.php b/tests/lib/filesystem.php
index 3e28d8c06e5..e041255ec91 100644
--- a/tests/lib/filesystem.php
+++ b/tests/lib/filesystem.php
@@ -59,6 +59,17 @@ class Test_Filesystem extends UnitTestCase{
 		$this->assertEqual('/',OC_Filesystem::getMountPoint('/some'));
 		$this->assertEqual('folder',OC_Filesystem::getInternalPath('/some/folder'));
 	}
+
+	public function testNormalize(){
+		$this->assertEqual('/path',OC_Filesystem::normalizePath('/path/'));
+		$this->assertEqual('/path',OC_Filesystem::normalizePath('path'));
+		$this->assertEqual('/path',OC_Filesystem::normalizePath('\path'));
+		$this->assertEqual('/foo/bar',OC_Filesystem::normalizePath('/foo//bar/'));
+		$this->assertEqual('/foo/bar',OC_Filesystem::normalizePath('/foo////bar'));
+		if(class_exists('Normalizer')){
+			$this->assertEqual("/foo/bar\xC3\xBC",OC_Filesystem::normalizePath("/foo/baru\xCC\x88"));
+		}
+	}
 }
 
 ?>
\ No newline at end of file