Merge branch 'master' into calendar

120 files changed, 1580 insertions, 797 deletions

diff --git a/3rdparty/MDB2/Driver/Manager/pgsql.php b/3rdparty/MDB2/Driver/Manager/pgsql.php
index a2e80caa5ce..44a611d399d 100644
--- a/3rdparty/MDB2/Driver/Manager/pgsql.php
+++ b/3rdparty/MDB2/Driver/Manager/pgsql.php
@@ -68,7 +68,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function createDatabase($name, $options = array())
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -95,7 +95,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function alterDatabase($name, $options = array())
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -122,7 +122,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function dropDatabase($name)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -181,7 +181,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function truncateTable($name)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -209,7 +209,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function vacuum($table = null, $options = array())
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -326,7 +326,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function alterTable($name, $changes, $check)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -396,6 +396,9 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
                     }
                     $db->loadModule('Datatype', null, true);
                     $type = $db->datatype->getTypeDeclaration($field['definition']);
+                    if($type=='SERIAL PRIMARY KEY'){//not correct when altering a table, since serials arent a real type
+						$type='INTEGER';//use integer instead
+                    }
                     $query = "ALTER $field_name TYPE $type USING CAST($field_name AS $type)";
                     $result = $db->exec("ALTER TABLE $name $query");
                     if (PEAR::isError($result)) {
@@ -441,7 +444,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function listDatabases()
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -474,7 +477,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function listUsers()
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -501,7 +504,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function listViews($database = null)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -680,7 +683,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function listTableFields($table)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -692,7 +695,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
             $table = $db->quoteIdentifier($schema, true) . '.' .$table;
         }
         $db->setLimit(1);
-        $result2 = $db->query("SELECT * FROM $table");
+        $result2 = $db->query("SELECT * FROM $table LIMIT 1");
         if (PEAR::isError($result2)) {
             return $result2;
         }
@@ -716,7 +719,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function listTableIndexes($table)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -769,7 +772,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function dropConstraint($table, $name, $primary = false)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -817,7 +820,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function listTableConstraints($table)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -882,7 +885,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function createSequence($seq_name, $start = 1)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -904,7 +907,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function dropSequence($seq_name)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -924,7 +927,7 @@ class MDB2_Driver_Manager_pgsql extends MDB2_Driver_Manager_Common
      */
     function listSequences($database = null)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
diff --git a/3rdparty/MDB2/Driver/Reverse/pgsql.php b/3rdparty/MDB2/Driver/Reverse/pgsql.php
index 649c1cad9ee..8669c2b919b 100644
--- a/3rdparty/MDB2/Driver/Reverse/pgsql.php
+++ b/3rdparty/MDB2/Driver/Reverse/pgsql.php
@@ -69,7 +69,7 @@ class MDB2_Driver_Reverse_pgsql extends MDB2_Driver_Reverse_Common
      */
     function getTableFieldDefinition($table_name, $field_name)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -198,7 +198,7 @@ class MDB2_Driver_Reverse_pgsql extends MDB2_Driver_Reverse_Common
      */
     function getTableIndexDefinition($table_name, $index_name)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -256,7 +256,7 @@ class MDB2_Driver_Reverse_pgsql extends MDB2_Driver_Reverse_Common
      */
     function getTableConstraintDefinition($table_name, $constraint_name)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -443,7 +443,7 @@ class MDB2_Driver_Reverse_pgsql extends MDB2_Driver_Reverse_Common
      */
     function getTriggerDefinition($trigger)
     {
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
@@ -517,7 +517,7 @@ class MDB2_Driver_Reverse_pgsql extends MDB2_Driver_Reverse_Common
            return parent::tableInfo($result, $mode);
         }
 
-        $db =& $this->getDBInstance();
+        $db =$this->getDBInstance();
         if (PEAR::isError($db)) {
             return $db;
         }
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 8fb628a205c..7b9e5cff0c0 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -435,6 +435,7 @@ Calendar={
 							$(button).closest('tr').prev().html(data.page).show().next().remove();
 							$('#calendar_holder').fullCalendar('removeEventSource', data.eventSource.url);
 							$('#calendar_holder').fullCalendar('addEventSource', data.eventSource);
+							$('#choosecalendar_dialog > table').append('<tr><td colspan="6"><a href="#" onclick="Calendar.UI.Calendar.newCalendar(this);">' + newcalendar + '</a></td></tr>');
 						}
 					}, 'json');
 			},
diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php
index 617fc2a2ff0..aae6f235fc4 100644
--- a/apps/calendar/l10n/de.php
+++ b/apps/calendar/l10n/de.php
@@ -79,6 +79,25 @@
 "Today" => "Heute",
 "Calendars" => "Kalender",
 "There was a fail, while parsing the file." => "Fehler beim Einlesen der Datei.",
+"Sun." => "So",
+"Mon." => "Mo",
+"Tue." => "Die",
+"Wed." => "Mi",
+"Thu." => "Do",
+"Fri." => "Fr",
+"Sat." => "Sa",
+"Jan." => "Jan",
+"Feb." => "Feb",
+"Mar." => "Mär",
+"Apr." => "Apr",
+"May." => "Mai",
+"Jun." => "Juni",
+"Jul." => "Juli",
+"Aug." => "Aug",
+"Sep." => "Sep",
+"Oct." => "Okt",
+"Nov." => "Nov",
+"Dec." => "Dez",
 "Choose active calendars" => "Aktive Kalender wählen",
 "New Calendar" => "Neuer Kalender",
 "CalDav Link" => "CalDAV-Link",
diff --git a/apps/calendar/l10n/fr.php b/apps/calendar/l10n/fr.php
index 82b58f6ad61..36ce1ad875c 100644
--- a/apps/calendar/l10n/fr.php
+++ b/apps/calendar/l10n/fr.php
@@ -133,8 +133,14 @@
 "Location of the Event" => "Emplacement de l'événement",
 "Description" => "Description",
 "Description of the Event" => "Description de l'événement",
+"Import a calendar file" => "Importer un fichier de calendriers",
 "Please choose the calendar" => "Choisissez le calendrier svp",
+"create a new calendar" => "Créer un nouveau calendrier",
+"Name of new calendar" => "Nom pour le nouveau calendrier",
 "Import" => "Importer",
+"Importing calendar" => "Import du calendrier",
+"Calendar imported successfully" => "Calendrier importé avec succès",
+"Close Dialog" => "Fermer la fenêtre",
 "Create a new event" => "Créer un nouvel événement",
 "Timezone" => "Fuseau horaire",
 "Check always for changes of the timezone" => "Toujours vérifier d'éventuels changements de fuseau horaire",
diff --git a/apps/calendar/l10n/gl.php b/apps/calendar/l10n/gl.php
new file mode 100644
index 00000000000..6cdaa98e96b
--- /dev/null
+++ b/apps/calendar/l10n/gl.php
@@ -0,0 +1,154 @@
+<?php $TRANSLATIONS = array(
+"New Timezone:" => "Novo fuso horario:",
+"Timezone changed" => "Fuso horario trocado",
+"Invalid request" => "Petición non válida",
+"Calendar" => "Calendario",
+"Wrong calendar" => "Calendario equivocado",
+"Birthday" => "Cumpleanos",
+"Business" => "Traballo",
+"Call" => "Chamada",
+"Clients" => "Clientes",
+"Holidays" => "Vacacións",
+"Ideas" => "Ideas",
+"Journey" => "Viaxe",
+"Jubilee" => "Aniversario",
+"Meeting" => "Reunión",
+"Other" => "Outro",
+"Personal" => "Personal",
+"Projects" => "Proxectos",
+"Questions" => "Preguntas",
+"Work" => "Traballo",
+"Does not repeat" => "Non se repite",
+"Daily" => "A diario",
+"Weekly" => "Semanalmente",
+"Every Weekday" => "Tódalas semanas",
+"Bi-Weekly" => "Cada dúas semanas",
+"Monthly" => "Mensualmente",
+"Yearly" => "Anual",
+"never" => "nunca",
+"by occurrences" => "por acontecementos",
+"by date" => "por data",
+"by monthday" => "por día do mes",
+"by weekday" => "por día da semana",
+"Monday" => "Luns",
+"Tuesday" => "Martes",
+"Wednesday" => "Mércores",
+"Thursday" => "Xoves",
+"Friday" => "Venres",
+"Saturday" => "Sábado",
+"Sunday" => "Domingo",
+"events week of month" => "semana dos eventos no mes",
+"first" => "primeiro",
+"second" => "segundo",
+"third" => "terceiro",
+"fourth" => "cuarto",
+"fifth" => "quinto",
+"last" => "último",
+"January" => "Xaneiro",
+"February" => "Febreiro",
+"March" => "Marzo",
+"April" => "Abril",
+"May" => "Maio",
+"June" => "Xuño",
+"July" => "Xullo",
+"August" => "Agosto",
+"September" => "Setembro",
+"October" => "Outubro",
+"November" => "Novembro",
+"December" => "Nadal",
+"by events date" => "por data dos eventos",
+"by yearday(s)" => "por dia(s) do ano",
+"by weeknumber(s)" => "por número(s) de semana",
+"by day and month" => "por día e mes",
+"Not an array" => "Non é un conxunto",
+"Date" => "Data",
+"Cal." => "Cal.",
+"All day" => "Todo o dia",
+"Missing fields" => "Faltan campos",
+"Title" => "Título",
+"From Date" => "Desde Data",
+"From Time" => "Desde Hora",
+"To Date" => "a Data",
+"To Time" => "a Hora",
+"The event ends before it starts" => "O evento remata antes de iniciarse",
+"There was a database fail" => "Houbo un erro na base de datos",
+"Week" => "Semana",
+"Month" => "Mes",
+"List" => "Lista",
+"Today" => "Hoxe",
+"Calendars" => "Calendarios",
+"There was a fail, while parsing the file." => "Houbo un erro ao procesar o ficheiro",
+"Sun." => "Dom.",
+"Mon." => "Lun.",
+"Tue." => "Mar.",
+"Wed." => "Mer.",
+"Thu." => "Xov.",
+"Fri." => "Ven.",
+"Sat." => "Sáb.",
+"Jan." => "Xan.",
+"Feb." => "Feb.",
+"Mar." => "Mar.",
+"Apr." => "Abr.",
+"May." => "Mai.",
+"Jun." => "Xuñ.",
+"Jul." => "Xul.",
+"Aug." => "Ago.",
+"Sep." => "Set.",
+"Oct." => "Out.",
+"Nov." => "Nov.",
+"Dec." => "Nad.",
+"Choose active calendars" => "Escolla os calendarios activos",
+"New Calendar" => "Novo calendario",
+"CalDav Link" => "Ligazón CalDav",
+"Download" => "Baixar",
+"Edit" => "Editar",
+"Delete" => "Borrar",
+"New calendar" => "Novo calendario",
+"Edit calendar" => "Editar calendario",
+"Displayname" => "Mostrar nome",
+"Active" => "Activo",
+"Calendar color" => "Cor do calendario",
+"Save" => "Gardar",
+"Submit" => "Enviar",
+"Cancel" => "Cancelar",
+"Edit an event" => "Editar un evento",
+"Export" => "Exportar",
+"Title of the Event" => "Título do evento",
+"Category" => "Categoría",
+"Select category" => "Seleccionar categoría",
+"All Day Event" => "Evento para todo o día",
+"From" => "Desde",
+"To" => "Para",
+"Advanced options" => "Opcións avanzadas",
+"Repeat" => "Repetir",
+"Advanced" => "Avanzado",
+"Select weekdays" => "Seleccionar días da semana",
+"Select days" => "Seleccionar días",
+"and the events day of year." => "e día dos eventos no ano.",
+"and the events day of month." => "e día dos eventos no mes.",
+"Select months" => "Seleccione meses",
+"Select weeks" => "Seleccione semanas",
+"and the events week of year." => "e semana dos eventos no ano.",
+"Interval" => "Intervalo",
+"End" => "Fin",
+"occurrences" => "acontecementos",
+"Location" => "Localización",
+"Location of the Event" => "Localización do evento",
+"Description" => "Descripción",
+"Description of the Event" => "Descripción do evento",
+"Import a calendar file" => "Importar ficheiro de calendario",
+"Please choose the calendar" => "Por favor, seleccione o calendario",
+"create a new calendar" => "crear un novo calendario",
+"Name of new calendar" => "Nome do novo calendario",
+"Import" => "Importar",
+"Importing calendar" => "Importar calendario",
+"Calendar imported successfully" => "Calendario importado con éxito",
+"Close Dialog" => "Pechar cadro",
+"Create a new event" => "Crear un novo evento",
+"Timezone" => "Fuso horario",
+"Check always for changes of the timezone" => "Comprobar sempre cambios de fuso horario",
+"Timeformat" => "Formato de hora",
+"24h" => "24h",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "Dirección de sincronización do calendario CalDAV:"
+);
diff --git a/apps/calendar/l10n/it.php b/apps/calendar/l10n/it.php
index 71cfa6c8464..cb125043593 100644
--- a/apps/calendar/l10n/it.php
+++ b/apps/calendar/l10n/it.php
@@ -38,6 +38,7 @@
 "Friday" => "Venerdì",
 "Saturday" => "Sabato",
 "Sunday" => "Domenica",
+"events week of month" => "settimana del mese degli eventi",
 "first" => "primo",
 "second" => "secondo",
 "third" => "terzo",
@@ -56,6 +57,10 @@
 "October" => "Ottobre",
 "November" => "Novembre",
 "December" => "Dicembre",
+"by events date" => "per data evento",
+"by yearday(s)" => "per giorno/i dell'anno",
+"by weeknumber(s)" => "per numero/i settimana",
+"by day and month" => "per giorno e mese",
 "Not an array" => "Non è un array",
 "Date" => "Data",
 "Cal." => "Cal.",
@@ -74,6 +79,25 @@
 "Today" => "Oggi",
 "Calendars" => "Calendari",
 "There was a fail, while parsing the file." => "C'è stato un errore nel parsing del file.",
+"Sun." => "Dom.",
+"Mon." => "Lun.",
+"Tue." => "Mar.",
+"Wed." => "Mer.",
+"Thu." => "Gio.",
+"Fri." => "Ven.",
+"Sat." => "Sab.",
+"Jan." => "Gen.",
+"Feb." => "Feb.",
+"Mar." => "Mar.",
+"Apr." => "Apr.",
+"May." => "Mag.",
+"Jun." => "Giu.",
+"Jul." => "Lug.",
+"Aug." => "Ago.",
+"Sep." => "Set.",
+"Oct." => "Ott.",
+"Nov." => "Nov.",
+"Dec." => "Dic.",
 "Choose active calendars" => "Selezionare calendari attivi",
 "New Calendar" => "Nuovo Calendario",
 "CalDav Link" => "CalDav Link",
@@ -98,18 +122,29 @@
 "To" => "A",
 "Advanced options" => "Opzioni avanzate",
 "Repeat" => "Ripeti",
+"Advanced" => "Avanzato",
 "Select weekdays" => "Seleziona i giorni della settimana",
 "Select days" => "Seleziona i giorni",
+"and the events day of year." => "e il giorno dell'anno degli eventi",
+"and the events day of month." => "e il giorno del mese degli eventi",
 "Select months" => "Seleziona i mesi",
 "Select weeks" => "Seleziona le settimane",
+"and the events week of year." => "e la settimana dell'anno degli eventi",
 "Interval" => "Intervallo",
 "End" => "Fine",
+"occurrences" => "occorrenze",
 "Location" => "Luogo",
 "Location of the Event" => "Luogo evento",
 "Description" => "Descrizione",
 "Description of the Event" => "Descrizione evento",
+"Import a calendar file" => "Importa un file calendario",
 "Please choose the calendar" => "Per favore scegli il calendario",
+"create a new calendar" => "Crea un nuovo calendario",
+"Name of new calendar" => "Nome del nuovo calendario",
 "Import" => "Importa",
+"Importing calendar" => "Sto importando il calendario",
+"Calendar imported successfully" => "Calendario importato con successo",
+"Close Dialog" => "Chiudi la finestra di dialogo",
 "Create a new event" => "Crea evento",
 "Timezone" => "Fuso orario",
 "Check always for changes of the timezone" => "Controlla sempre i cambiamenti di fuso orario",
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 6b2cd68c6fb..feafd17635b 100755
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -7,16 +7,17 @@
 				var monthNamesShort = <?php echo json_encode($l->tA(array('Jan.', 'Feb.', 'Mar.', 'Apr.', 'May.', 'Jun.', 'Jul.', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Dec.'))) ?>;
 				var agendatime = '<?php echo ((int) OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>{ - <?php echo ((int) OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>}';
 				var defaulttime = '<?php echo ((int) OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>';
-				var allDayText = '<?php echo $l->t('All day') ?>';
-				var missing_field = '<?php echo $l->t('Missing fields') ?>';
-				var missing_field_title = '<?php echo $l->t('Title') ?>';
-				var missing_field_calendar = '<?php echo $l->t('Calendar') ?>';
-				var missing_field_fromdate = '<?php echo $l->t('From Date') ?>';
-				var missing_field_fromtime = '<?php echo $l->t('From Time') ?>';
-				var missing_field_todate = '<?php echo $l->t('To Date') ?>';
-				var missing_field_totime = '<?php echo $l->t('To Time') ?>';
-				var missing_field_startsbeforeends = '<?php echo $l->t('The event ends before it starts') ?>';
-				var missing_field_dberror = '<?php echo $l->t('There was a database fail') ?>';
+				var allDayText = '<?php echo addslashes($l->t('All day')) ?>';
+				var newcalendar = '<?php echo addslashes($l->t('New Calendar')) ?>';
+				var missing_field = '<?php echo addslashes($l->t('Missing fields')) ?>';
+				var missing_field_title = '<?php echo addslashes($l->t('Title')) ?>';
+				var missing_field_calendar = '<?php echo addslashes($l->t('Calendar')) ?>';
+				var missing_field_fromdate = '<?php echo addslashes($l->t('From Date')) ?>';
+				var missing_field_fromtime = '<?php echo addslashes($l->t('From Time')) ?>';
+				var missing_field_todate = '<?php echo addslashes($l->t('To Date')) ?>';
+				var missing_field_totime = '<?php echo addslashes($l->t('To Time')) ?>';
+				var missing_field_startsbeforeends = '<?php echo addslashes($l->t('The event ends before it starts')) ?>';
+				var missing_field_dberror = '<?php echo addslashes($l->t('There was a database fail')) ?>';
 				var totalurl = '<?php echo OC_Helper::linkTo('apps/calendar', 'caldav.php', null, true); ?>/calendars';
 				$(document).ready(function() {
 				<?php
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index 1b3fc607729..f421651671d 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Error en (des)activar la llibreta d'adreces.",
+"There was an error adding the contact." => "S'ha produït un error en afegir el contacte.",
+"Cannot add empty property." => "No es pot afegir una propietat buida.",
+"At least one of the address fields has to be filled out." => "Almenys heu d'omplir un dels camps d'adreça.",
+"Error adding contact property." => "Error en afegir la propietat del contacte.",
+"Error adding addressbook." => "Error en afegir la llibreta d'adreces.",
+"Error activating addressbook." => "Error en activar la llibreta d'adreces.",
+"Error deleting contact property." => "Error en eliminar la propietat del contacte.",
+"Error updating contact property." => "Error en actualitzar la propietat del contacte.",
+"Error updating addressbook." => "Error en actualitzar la llibreta d'adreces.",
+"Contacts" => "Contactes",
 "This is not your addressbook." => "Aquesta no és la vostra llibreta d'adreces",
 "Contact could not be found." => "No s'ha trobat el contacte.",
 "Information about vCard is incorrect. Please reload the page." => "La informació de la vCard és incorrecta. Carregueu la pàgina de nou.",
@@ -14,10 +25,13 @@
 "Fax" => "Fax",
 "Video" => "Vídeo",
 "Pager" => "Paginador",
+"Contact" => "Contacte",
 "This is not your contact." => "Aquest contacte no és vostre.",
 "This card is not RFC compatible." => "Aquesta targeta no és compatible amb RFC.",
 "This card does not contain a photo." => "Aquesta targeta no conté foto.",
 "Add Contact" => "Afegiu un contacte",
+"Addressbooks" => "Llibretes d'adreces",
+"Addressbook" => "Llibreta d'adreces",
 "Name" => "Nom",
 "Type" => "Tipus",
 "PO Box" => "Adreça Postal",
@@ -34,8 +48,11 @@
 "Download" => "Baixa",
 "Edit" => "Edita",
 "Delete" => "Elimina",
+"Download contact" => "Baixa el contacte",
 "Delete contact" => "Elimina el contacte",
 "Add" => "Afegeix",
+"New Addressbook" => "Nova llibreta d'adreces",
+"Edit Addressbook" => "Edita la llibreta d'adreces",
 "Displayname" => "Nom a mostrar",
 "Active" => "Actiu",
 "Save" => "Desa",
@@ -44,5 +61,6 @@
 "Birthday" => "Aniversari",
 "Preferred" => "Preferit",
 "Phone" => "Telèfon",
-"Update" => "Actualitza"
+"Update" => "Actualitza",
+"CardDAV syncing address:" => "Adreça de sincronització CardDAV:"
 );
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index 465e2d5456a..8970d716b0e 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses.",
+"There was an error adding the contact." => "Une erreur s'est produite lors de l'ajout du contact.",
+"Cannot add empty property." => "Impossible d'ajouter un champ vide.",
+"At least one of the address fields has to be filled out." => "Au moins un des champs d'adresses doit être complété.",
+"Error adding contact property." => "Erreur lors de l'ajout du champ.",
+"Error adding addressbook." => "Erreur lors de l'ajout du carnet d'adresses.",
+"Error activating addressbook." => "Erreur lors de l'activation du carnet d'adresses.",
+"Error deleting contact property." => "Erreur lors de la suppression du champ.",
+"Error updating contact property." => "Erreur lors de la mise à jour du champ.",
+"Error updating addressbook." => "Erreur lors de la mise à jour du carnet d'adresses.",
+"Contacts" => "Contacts",
 "This is not your addressbook." => "Ce n'est pas votre carnet d'adresses.",
 "Contact could not be found." => "Ce contact n'a pas été trouvé.",
 "Information about vCard is incorrect. Please reload the page." => "Les informations relatives à cette vCard sont incorrectes. Veuillez recharger la page.",
@@ -14,10 +25,13 @@
 "Fax" => "Fax",
 "Video" => "Vidéo",
 "Pager" => "Bipeur",
+"Contact" => "Contact",
 "This is not your contact." => "Ce n'est pas votre contact.",
 "This card is not RFC compatible." => "Cette fiche n'est pas compatible RFC.",
 "This card does not contain a photo." => "Cette fiche ne contient pas de photo.",
 "Add Contact" => "Ajouter un Contact",
+"Addressbooks" => "Carnets d'adresses",
+"Addressbook" => "Carnet d'adresses",
 "Name" => "Nom",
 "Type" => "Type",
 "PO Box" => "Boîte postale",
@@ -34,8 +48,11 @@
 "Download" => "Télécharger",
 "Edit" => "Modifier",
 "Delete" => "Supprimer",
+"Download contact" => "Télécharger le contact",
 "Delete contact" => "Supprimer le contact",
 "Add" => "Ajouter",
+"New Addressbook" => "Nouveau carnet d'adresses",
+"Edit Addressbook" => "Éditer le carnet d'adresses",
 "Displayname" => "Nom",
 "Active" => "Carnet actif",
 "Save" => "Sauvegarder",
@@ -44,5 +61,6 @@
 "Birthday" => "Anniversaire",
 "Preferred" => "Préféré",
 "Phone" => "Téléphone",
-"Update" => "Enregistrer"
+"Update" => "Enregistrer",
+"CardDAV syncing address:" => "Adresse de synchronisation CardDAV :"
 );
diff --git a/apps/contacts/l10n/gl.php b/apps/contacts/l10n/gl.php
new file mode 100644
index 00000000000..0fd88ead191
--- /dev/null
+++ b/apps/contacts/l10n/gl.php
@@ -0,0 +1,66 @@
+<?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Erro (des)activando o directorio",
+"There was an error adding the contact." => "Houbo un erro engadindo o contacto",
+"Cannot add empty property." => "Non se pode engadir unha propiedade baldeira",
+"At least one of the address fields has to be filled out." => "A lo menos un dos campos de dirección ten que ser cuberto",
+"Error adding contact property." => "Erro engadindo unha propiedade do contacto.",
+"Error adding addressbook." => "Erro engadindo directorio.",
+"Error activating addressbook." => "Erro activando o directorio.",
+"Error deleting contact property." => "Erro borrando propiedade do contacto.",
+"Error updating contact property." => "Erro actualizando a propiedade do contacto.",
+"Error updating addressbook." => "Erro actualizando o directorio.",
+"Contacts" => "Contactos",
+"This is not your addressbook." => "Este non é o seu directorio",
+"Contact could not be found." => "Non se atopou o contacto",
+"Information about vCard is incorrect. Please reload the page." => "A información sobre a vCard é incorrecta. Por favor volte a cargar a páxina.",
+"Address" => "Dirección",
+"Telephone" => "Teléfono",
+"Email" => "Correo electrónico",
+"Organization" => "Organización",
+"Work" => "Emprego",
+"Home" => "Casa",
+"Mobile" => "Móbil",
+"Text" => "Texto",
+"Voice" => "Voz",
+"Fax" => "Fax",
+"Video" => "Vídeo",
+"Pager" => "Paxinador",
+"Contact" => "Contacto",
+"This is not your contact." => "Este non é un dos seus contactos",
+"This card is not RFC compatible." => "Esta tarxeta non é compatible con RFC",
+"This card does not contain a photo." => "Esta tarxeta non ten fotografía",
+"Add Contact" => "Engadir contacto",
+"Addressbooks" => "Directorios",
+"Addressbook" => "Directorio",
+"Name" => "Nome",
+"Type" => "Escriba",
+"PO Box" => "Apartado de Correos",
+"Extended" => "Extendido",
+"Street" => "Rúa",
+"City" => "Cidade",
+"Region" => "Rexión",
+"Zipcode" => "Código Postal",
+"Country" => "País",
+"Create Contact" => "Crear contacto",
+"Choose active Address Books" => "Escolla os Directorios Activos",
+"New Address Book" => "Novo Directorio",
+"CardDav Link" => "Ligazón CardDav",
+"Download" => "Baixar",
+"Edit" => "Editar",
+"Delete" => "Eliminar",
+"Download contact" => "Descargar contacto",
+"Delete contact" => "Borrar contacto",
+"Add" => "Engadir",
+"New Addressbook" => "Novo Directorio",
+"Edit Addressbook" => "Editar Directorio",
+"Displayname" => "Mostrar nome",
+"Active" => "Activo",
+"Save" => "Gardar",
+"Submit" => "Enviar",
+"Cancel" => "Cancelar",
+"Birthday" => "Cumpleanos",
+"Preferred" => "Preferido",
+"Phone" => "Teléfono",
+"Update" => "Actualizar",
+"CardDAV syncing address:" => "Dirección de sincronización CardDAV:"
+);
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index c4360d89133..6ac1677e3c0 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Errore nel (dis)attivare la rubrica",
+"There was an error adding the contact." => "Si è verificato un errore nell'aggiunta del contatto.",
+"Cannot add empty property." => "Impossibile aggiungere una proprietà vuota.",
+"At least one of the address fields has to be filled out." => "Deve essere riempito almeno un indirizzo .",
+"Error adding contact property." => "Errore durante l'aggiunta della proprietà del contatto.",
+"Error adding addressbook." => "Errore nell'aggiunta della rubrica.",
+"Error activating addressbook." => "Errore nell'attivazione della rubrica.",
+"Error deleting contact property." => "Errore nella cancellazione della proprietà del contatto.",
+"Error updating contact property." => "Errore nell'aggiornamento della proprietà del contatto.",
+"Error updating addressbook." => "Errore nell'aggiornamento della rubrica.",
+"Contacts" => "Contatti",
 "This is not your addressbook." => "Questa non è la tua rubrica.",
 "Contact could not be found." => "Il contatto non può essere trovato",
 "Information about vCard is incorrect. Please reload the page." => "Informazioni sulla vCard incorrette. Ricaricare la pagina.",
@@ -14,10 +25,13 @@
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Cercapersone",
+"Contact" => "Contatto",
 "This is not your contact." => "Questo non è un tuo contatto.",
 "This card is not RFC compatible." => "Questa card non è compatibile con il protocollo RFC.",
 "This card does not contain a photo." => "Questa card non contiene una foto.",
 "Add Contact" => "Aggiungi contatto",
+"Addressbooks" => "Rubriche",
+"Addressbook" => "Rubrica",
 "Name" => "Nome",
 "Type" => "Tipo",
 "PO Box" => "Casella postale",
@@ -34,8 +48,11 @@
 "Download" => "Scarica",
 "Edit" => "Modifica",
 "Delete" => "Cancella",
+"Download contact" => "Scarica contatto",
 "Delete contact" => "Cancella contatto",
 "Add" => "Aggiungi",
+"New Addressbook" => "Nuova Rubrica",
+"Edit Addressbook" => "Modifica Rubrica",
 "Displayname" => "Nome da mostrare",
 "Active" => "Attiva",
 "Save" => "Salva",
@@ -44,5 +61,6 @@
 "Birthday" => "Compleanno",
 "Preferred" => "Preferito",
 "Phone" => "Telefono",
-"Update" => "Aggiorna"
+"Update" => "Aggiorna",
+"CardDAV syncing address:" => "Indirizzo di sincronizzazione CarDAV:"
 );
diff --git a/apps/contacts/l10n/sr.php b/apps/contacts/l10n/sr.php
index 882381c37c2..d09bac430f2 100644
--- a/apps/contacts/l10n/sr.php
+++ b/apps/contacts/l10n/sr.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Contacts" => "Контакти",
 "This is not your addressbook." => "Ово није ваш адресар.",
 "Contact could not be found." => "Контакт се не може наћи.",
 "Information about vCard is incorrect. Please reload the page." => "Подаци о вКарти су неисправни. Поново учитајте страницу.",
@@ -14,11 +15,15 @@
 "Fax" => "Факс",
 "Video" => "Видео",
 "Pager" => "Пејџер",
+"Contact" => "Контакт",
 "This is not your contact." => "Ово није ваш контакт.",
 "This card is not RFC compatible." => "Ова карта није сагласна са РФЦ-ом.",
 "This card does not contain a photo." => "Ова карта не садржи фотографију.",
 "Add Contact" => "Додај контакт",
+"Addressbooks" => "Адресар",
+"Addressbook" => "Адресар",
 "Name" => "Име",
+"Type" => "Тип",
 "PO Box" => "Поштански број",
 "Extended" => "Прошири",
 "Street" => "Улица",
@@ -27,8 +32,23 @@
 "Zipcode" => "Зип код",
 "Country" => "Земља",
 "Create Contact" => "Направи контакт",
+"Choose active Address Books" => "Изаберите активне адресаре",
+"New Address Book" => "Нови адресар",
+"Download" => "Преузимање",
 "Edit" => "Уреди",
 "Delete" => "Обриши",
+"Download contact" => "Преузми контакт",
+"Delete contact" => "Обриши контакт",
+"Add" => "Додај",
+"New Addressbook" => "Нови адресар",
+"Edit Addressbook" => "Уреди адресар",
+"Displayname" => "Приказано име",
+"Active" => "Активан",
+"Save" => "Сними",
+"Submit" => "Пошаљи",
+"Cancel" => "Откажи",
 "Birthday" => "Рођендан",
-"Phone" => "Телефон"
+"Preferred" => "Пожељан",
+"Phone" => "Телефон",
+"Update" => "Ажурирај"
 );
diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php
index 9af7f0654dd..679ae5ede2f 100644
--- a/apps/contacts/templates/part.details.php
+++ b/apps/contacts/templates/part.details.php
@@ -1,6 +1,6 @@
 <?php if(array_key_exists('FN',$_['details'])): ?>
 	<?php echo $this->inc('part.property.FN', array('property' => $_['details']['FN'][0])); ?>
-	<a href="export?contactid=<?php echo $_['id']; ?>"><img class="svg action" id="contacts_downloadcard" src="<?php echo image_path('', 'actions/download.svg'); ?>" title="<?php echo $l->t('Download contact');?>" /></a>
+	<a href="export.php?contactid=<?php echo $_['id']; ?>"><img class="svg action" id="contacts_downloadcard" src="<?php echo image_path('', 'actions/download.svg'); ?>" title="<?php echo $l->t('Download contact');?>" /></a>
 	<img class="svg action" id="contacts_deletecard" src="<?php echo image_path('', 'actions/delete.svg'); ?>" title="<?php echo $l->t('Delete contact');?>" />
 
 	<?php if(isset($_['details']['PHOTO'])): // Emails first ?>
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index c175142319f..8d589ea5e2e 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -5,6 +5,7 @@ require_once('apps/files_sharing/sharedstorage.php');
 OC::$CLASSPATH['OC_Share'] = "apps/files_sharing/lib_share.php";
 OC_Hook::connect("OC_Filesystem", "post_delete", "OC_Share", "deleteItem");
 OC_Hook::connect("OC_Filesystem", "post_rename", "OC_Share", "renameItem");
+OC_Hook::connect("OC_Filesystem", "post_write", "OC_Share", "updateItem");
 OC_Filesystem::registerStorageType("shared", "OC_Filestorage_Shared", array("datadir" => "string"));
 OC_Util::addScript("files_sharing", "share");
 OC_Util::addScript("3rdparty", "chosen/chosen.jquery.min");
diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index cde33fd1dc5..0eb0e5bf85d 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -91,6 +91,9 @@ class OC_Share {
 				// Clear the folder size cache for the 'Shared' folder
 				$clearFolderSize = OC_DB::prepare("DELETE FROM *PREFIX*foldersize WHERE path = ?");
 				$clearFolderSize->execute(array($sharedFolder));
+				// Emit post_create and post_write hooks to notify of a new file in the user's filesystem
+				OC_Hook::emit("OC_Filesystem", "post_create", array('path' => $target));
+				OC_Hook::emit("OC_Filesystem", "post_write", array('path' => $target));
 			}
 		}
 	}
@@ -263,6 +266,18 @@ class OC_Share {
 		}
 	}
 
+	public static function getTarget($source) {
+		$source = self::cleanPath($source);
+		$query = OC_DB::prepare("SELECT target FROM *PREFIX*sharing WHERE source = ? AND uid_owner = ? LIMIT 1");
+		$result = $query->execute(array($source, OC_User::getUser()))->fetchAll();
+		if (count($result) > 0) {
+			return $result[0]['target'];
+		} else {
+			// TODO Check in folders
+			return false;
+		}
+	}
+
 	/**
 	 * Get the user's permissions for the item at the specified target location
 	 * @param $target The target location of the item
@@ -380,8 +395,13 @@ class OC_Share {
 	*/
 	public static function deleteItem($arguments) {
 		$source = "/".OC_User::getUser()."/files".self::cleanPath($arguments['path']);
-		$query = OC_DB::prepare("DELETE FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? AND uid_owner = ?");
-		$query->execute(array(strlen($source), $source, OC_User::getUser()));
+		if ($target = self::getTarget($source)) {
+			// Forward hook to notify of changes to target file
+			OC_Hook::emit("OC_Filesystem", "post_delete", array('path' => $target));
+			$query = OC_DB::prepare("DELETE FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? AND uid_owner = ?");
+			$query->execute(array(strlen($source), $source, OC_User::getUser()));
+		}
+		
 	}
 
 	/**
@@ -395,6 +415,14 @@ class OC_Share {
 		$query->execute(array($oldSource, $newSource, OC_User::getUser()));
 	}
 
+	public static function updateItem($arguments) {
+		$source = "/".OC_User::getUser()."/files".self::cleanPath($arguments['path']);
+		if ($target = self::getTarget($source)) {
+			// Forward hook to notify of changes to target file
+			OC_Hook::emit("OC_Filesystem", "post_write", array('path' => $target));
+		}
+	}
+
 }
 
 ?>
diff --git a/apps/gallery/l10n/ca.php b/apps/gallery/l10n/ca.php
new file mode 100644
index 00000000000..f3eb40df553
--- /dev/null
+++ b/apps/gallery/l10n/ca.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Galeria",
+"Rescan" => "Escaneja de nou",
+"Back" => "Enrera"
+);
diff --git a/apps/gallery/l10n/de.php b/apps/gallery/l10n/de.php
index 4ca5c83249c..b7f1934189a 100644
--- a/apps/gallery/l10n/de.php
+++ b/apps/gallery/l10n/de.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-  "Gallery" => "Galerie",
-  "Back" => "Zurück"
+"Gallery" => "Galerie",
+"Rescan" => "Rescan",
+"Back" => "Zurück"
 );
-?>
diff --git a/apps/gallery/l10n/fr.php b/apps/gallery/l10n/fr.php
new file mode 100644
index 00000000000..17902bd70c9
--- /dev/null
+++ b/apps/gallery/l10n/fr.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Galerie",
+"Rescan" => "Analyser à nouveau",
+"Back" => "Retour"
+);
diff --git a/apps/gallery/l10n/gl.php b/apps/gallery/l10n/gl.php
new file mode 100644
index 00000000000..b4f9885a525
--- /dev/null
+++ b/apps/gallery/l10n/gl.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Galería",
+"Rescan" => "Voltar a analizar",
+"Back" => "Atrás"
+);
diff --git a/apps/gallery/l10n/it.php b/apps/gallery/l10n/it.php
new file mode 100644
index 00000000000..0f95cc3af66
--- /dev/null
+++ b/apps/gallery/l10n/it.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Galleria",
+"Rescan" => "Rileggi",
+"Back" => "Indietro"
+);
diff --git a/apps/gallery/l10n/sk_SK.php b/apps/gallery/l10n/sk_SK.php
new file mode 100644
index 00000000000..d8ae41af96e
--- /dev/null
+++ b/apps/gallery/l10n/sk_SK.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Galéria",
+"Rescan" => "Znovu oskenovať",
+"Back" => "Späť"
+);
diff --git a/apps/gallery/l10n/sr.php b/apps/gallery/l10n/sr.php
new file mode 100644
index 00000000000..c6976b56a9f
--- /dev/null
+++ b/apps/gallery/l10n/sr.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Галерија",
+"Rescan" => "Претражи поново",
+"Back" => "Назад"
+);
diff --git a/apps/gallery/l10n/zh_CN.php b/apps/gallery/l10n/zh_CN.php
new file mode 100644
index 00000000000..c506600c4c0
--- /dev/null
+++ b/apps/gallery/l10n/zh_CN.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "画廊",
+"Rescan" => "重新扫描",
+"Back" => "返回"
+);
diff --git a/apps/gallery/templates/view_album.php b/apps/gallery/templates/view_album.php
index 7e3a67df4e4..55a2ee09e4a 100644
--- a/apps/gallery/templates/view_album.php
+++ b/apps/gallery/templates/view_album.php
@@ -16,7 +16,7 @@ $l = new OC_L10N('gallery');
 </script>
 
 <div id="controls">
-  <a href="?"><input type="button" value="<? echo $l->t('Back');?>" /></a>
+  <a href="?"><input type="button" value="<?php echo $l->t('Back');?>" /></a>
 <br/>
 </div>
 
diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php
index 93298c82c55..4a93e84910e 100644
--- a/apps/media/ajax/api.php
+++ b/apps/media/ajax/api.php
@@ -23,9 +23,6 @@
 
 header('Content-type: text/html; charset=UTF-8') ;
 
-//no apps
-$RUNTIME_NOAPPS=true;
-
 require_once('../../../lib/base.php');
 OC_JSON::checkAppEnabled('media');
 require_once('../lib_collection.php');
diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index da0407fca58..bcd8cf9178b 100644
--- a/apps/media/css/music.css
+++ b/apps/media/css/music.css
@@ -8,7 +8,6 @@ a.jp-next { left:5em; }
 div.jp-progress { position:absolute; overflow:hidden; top:.5em; left:8em; width:15em; height:1.2em; padding:0; }
 div.jp-seek-bar { background:#eee; width:0; height:100%; cursor:pointer; }
 div.jp-play-bar { background:#ccc; width:0; height:100%; }
-div.jp-seeking-bg { background:url("../img/pbar-ani.gif"); }
 div.jp-current-time,div.jp-duration { position:absolute; font-size:.64em; font-style:oblique; top:0.9em; left:13.5em; }
 div.jp-duration { display: none }
 div.jp-current-song { left: 33em; position: absolute; top: 0.9em; }
diff --git a/apps/media/js/loader.js b/apps/media/js/loader.js
index dff4163897f..055f858ae16 100644
--- a/apps/media/js/loader.js
+++ b/apps/media/js/loader.js
@@ -52,10 +52,8 @@ $(document).ready(function() {
 	}
 	var oc_current_user=OC.currentUser;
 	if(typeof PlayList==='undefined'){
-		if(typeof localStorage !== 'undefined' && localStorage){
-			if(localStorage.getItem(oc_current_user+'oc_playlist_items') && localStorage.getItem(oc_current_user+'oc_playlist_items')!='[]' && localStorage.getItem(oc_current_user+'oc_playlist_active')!='true'){
-				loadPlayer();
-			}
+		if(OC.localStorage.getItem('playlist_items') && OC.localStorage.getItem('playlist_items').length && OC.localStorage.getItem('playlist_active')!=true){
+			loadPlayer();
 		}
 	}
 });
\ No newline at end of file
diff --git a/apps/media/js/player.js b/apps/media/js/player.js
index 1f76356fd97..ad406830833 100644
--- a/apps/media/js/player.js
+++ b/apps/media/js/player.js
@@ -34,7 +34,7 @@ var PlayList={
 			if(PlayList.player){
 				if(PlayList.player.data('jPlayer').options.supplied!=items[index].type){//the the audio type changes we need to reinitialize jplayer
 					PlayList.player.jPlayer("play",time);
-					localStorage.setItem(oc_current_user+'oc_playlist_time',time);
+					OC.localStorage.setItem('playlist_time',time);
 					PlayList.player.jPlayer("destroy");
 // 					PlayList.save(); // so that the init don't lose the playlist
 					PlayList.init(items[index].type,null); // init calls load that calls play
@@ -64,9 +64,8 @@ var PlayList={
 					}
 				}
 			}else{
-				localStorage.setItem(oc_current_user+'oc_playlist_time',time);
-				localStorage.setItem(oc_current_user+'oc_playlist_playing','true');
-//                 PlayList.save(); // so that the init don't lose the playlist
+				OC.localStorage.setItem('playlist_time',time);
+				OC.localStorage.setItem('playlist_playing',true);
 				PlayList.init(items[index].type,null); // init calls load that calls play
 			}
 		}
@@ -92,11 +91,11 @@ var PlayList={
 		$(PlayList.player).jPlayer({
 			ended:PlayList.next,
 			pause:function(){
-				localStorage.setItem(oc_current_user+'oc_playlist_playing','false');
+				OC.localStorage.setItem('playlist_playing',false);
 				document.title = "ownCloud";
 			},
 			play:function(event){
-				localStorage.setItem(oc_current_user+'oc_playlist_playing','true');
+				OC.localStorage.setItem('playlist_playing',true);
 				document.title = "\u25b8 " + event.jPlayer.status.media.name + " - " + event.jPlayer.status.media.artist + " - ownCloud";
 			},
 			supplied:type,
@@ -161,46 +160,42 @@ var PlayList={
 		}
 	},
 	save:function(){
-		if(typeof localStorage !== 'undefined' && localStorage){
-			localStorage.setItem(oc_current_user+'oc_playlist_items',JSON.stringify(PlayList.items));
-			localStorage.setItem(oc_current_user+'oc_playlist_current',PlayList.current);
-			if(PlayList.player) {
-				if(PlayList.player.data('jPlayer')) {
-					var time=Math.round(PlayList.player.data('jPlayer').status.currentTime);
-					localStorage.setItem(oc_current_user+'oc_playlist_time',time);
-					var volume=PlayList.player.data('jPlayer').options.volume*100;
-					localStorage.setItem(oc_current_user+'oc_playlist_volume',volume);
-				}
+		OC.localStorage.setItem('playlist_items',PlayList.items);
+		OC.localStorage.setItem('playlist_current',PlayList.current);
+		if(PlayList.player) {
+			if(PlayList.player.data('jPlayer')) {
+				var time=Math.round(PlayList.player.data('jPlayer').status.currentTime);
+				OC.localStorage.setItem('playlist_time',time);
+				var volume=PlayList.player.data('jPlayer').options.volume*100;
+				OC.localStorage.setItem('playlist_volume',volume);
 			}
-			localStorage.setItem(oc_current_user+'oc_playlist_active','true');
 		}
+		OC.localStorage.setItem('playlist_active',true);
 	},
 	load:function(){
-		if(typeof localStorage !== 'undefined' && localStorage){
-			PlayList.active=true;
-			localStorage.setItem(oc_current_user+'oc_playlist_active','true');
-			if(localStorage.hasOwnProperty(oc_current_user+'oc_playlist_items')){
-				PlayList.items=JSON.parse(localStorage.getItem(oc_current_user+'oc_playlist_items'));
-				if(PlayList.items.length>0){
-					PlayList.current=parseInt(localStorage.getItem(oc_current_user+'oc_playlist_current'));
-					var time=parseInt(localStorage.getItem(oc_current_user+'oc_playlist_time'));
-					if(localStorage.hasOwnProperty(oc_current_user+'oc_playlist_volume')){
-						var volume=localStorage.getItem(oc_current_user+'oc_playlist_volume');
-						PlayList.volume=volume/100;
-						$('.jp-volume-bar-value').css('width',volume+'%');
-						if(PlayList.player.data('jPlayer')){
-							PlayList.player.jPlayer("option",'volume',volume/100);
-						}
-					}
-					if(JSON.parse(localStorage.getItem(oc_current_user+'oc_playlist_playing'))){
-						PlayList.play(null,time);
-					}else{
-						PlayList.play(null,time,function(){
-							PlayList.player.jPlayer("pause");
-						});
+		PlayList.active=true;
+		OC.localStorage.setItem('playlist_active',true);
+		if(OC.localStorage.hasItem('playlist_items')){
+			PlayList.items=OC.localStorage.getItem('playlist_items');
+			if(PlayList.items && PlayList.items.length>0){
+				PlayList.current=OC.localStorage.getItem('playlist_current');
+				var time=OC.localStorage.getItem('playlist_time');
+				if(OC.localStorage.hasItem('playlist_volume')){
+					var volume=OC.localStorage.getItem('playlist_volume');
+					PlayList.volume=volume/100;
+					$('.jp-volume-bar-value').css('width',volume+'%');
+					if(PlayList.player.data('jPlayer')){
+						PlayList.player.jPlayer("option",'volume',volume/100);
 					}
-					PlayList.render();
 				}
+				if(OC.localStorage.getItem('playlist_playing')){
+					PlayList.play(null,time);
+				}else{
+					PlayList.play(null,time,function(){
+						PlayList.player.jPlayer("pause");
+					});
+				}
+				PlayList.render();
 			}
 		}
 	}
@@ -210,7 +205,7 @@ $(document).ready(function(){
 	$(window).bind('beforeunload', function (){
 		PlayList.save();
 		if(PlayList.active){
-			localStorage.setItem(oc_current_user+'oc_playlist_active','false');
+			OC.localStorage.setItem('playlist_active',false);
 		}
 	});
 
diff --git a/apps/media/l10n/gl.php b/apps/media/l10n/gl.php
new file mode 100644
index 00000000000..b2d0bc78355
--- /dev/null
+++ b/apps/media/l10n/gl.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Música",
+"Play" => "Reproducir",
+"Pause" => "Pausa",
+"Previous" => "Anterior",
+"Next" => "Seguinte",
+"Mute" => "Silenciar",
+"Unmute" => "Restaurar volume",
+"Rescan Collection" => "Voltar a analizar a Colección",
+"Artist" => "Artista",
+"Album" => "Album",
+"Title" => "Título"
+);
diff --git a/apps/media/lib_media.php b/apps/media/lib_media.php
index 485d616e1aa..0ade0e593dc 100644
--- a/apps/media/lib_media.php
+++ b/apps/media/lib_media.php
@@ -28,7 +28,7 @@ OC_Hook::connect('OC_User','post_login','OC_MEDIA','loginListener');
 OC_Hook::connect('OC_Filesystem','post_write','OC_MEDIA','updateFile');
 
 //listen for file deletions to clean the database if a song is deleted
-OC_Hook::connect('OC_Filesystem','delete','OC_MEDIA','deleteFile');
+OC_Hook::connect('OC_Filesystem','post_delete','OC_MEDIA','deleteFile');
 
 //list for file moves to update the database
 OC_Hook::connect('OC_Filesystem','post_rename','OC_MEDIA','moveFile');
diff --git a/core/js/js.js b/core/js/js.js
index 2bb6cff0cb0..c6cde3cea95 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -6,10 +6,14 @@
  */
 function t(app,text){
 	if( !( app in t.cache )){
-		
-		$.post( OC.filePath('core','ajax','translations.php'), {'app': app}, function(jsondata){
-			t.cache[app] = jsondata.data;
-		});
+		$.ajax(OC.filePath('core','ajax','translations.php'),{
+			async:false,//todo a proper sollution for this without sync ajax calls
+			data:{'app': app},
+			type:'POST',
+			success:function(jsondata){
+				t.cache[app] = jsondata.data;
+			},
+		})
 
 		// Bad answer ...
 		if( !( app in t.cache )){
@@ -130,6 +134,35 @@ OC.search.lastResults={};
 OC.addStyle.loaded=[];
 OC.addScript.loaded=[];
 
+if(typeof localStorage !='undefined'){
+	//user and instance awere localstorage
+	OC.localStorage={
+		namespace:'oc_'+OC.currentUser+'_'+OC.webroot+'_',
+		hasItem:function(name){
+			return OC.localStorage.getItem(name)!=null;
+		},
+		setItem:function(name,item){
+			return localStorage.setItem(OC.localStorage.namespace+name,JSON.stringify(item));
+		},
+		getItem:function(name){
+			return JSON.parse(localStorage.getItem(OC.localStorage.namespace+name));
+		}
+	}
+}else{
+	//dummy localstorage
+	OC.localStorage={
+		hasItem:function(name){
+			return false;
+		},
+		setItem:function(name,item){
+			return false;
+		},
+		getItem:function(name){
+			return null;
+		}
+	}
+}
+
 /**
  * implement Array.filter for browsers without native support
  */
@@ -410,3 +443,5 @@ if (!Array.prototype.map){
 $.fn.filterAttr = function(attr_name, attr_value) {  
    return this.filter(function() { return $(this).attr(attr_name) === attr_value; });
 };
+
+
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
new file mode 100644
index 00000000000..4ac995756ca
--- /dev/null
+++ b/core/l10n/gl.php
@@ -0,0 +1,39 @@
+<?php $TRANSLATIONS = array(
+"Owncloud password reset" => "Restablecemento do contrasinal de Owncloud",
+"Use the following link to reset your password: {link}" => "Use a seguinte ligazón para restablecer o contrasinal: {link}",
+"You will receive a link to reset your password via Email." => "Recibirás unha ligazón por correo electrónico para restablecer o contrasinal",
+"Requested" => "Solicitado",
+"Login failed!" => "Fallou a conexión!",
+"Username" => "Nome de usuario",
+"Request reset" => "Petición de restablecemento",
+"Your password was reset" => "O contrasinal foi restablecido",
+"To login page" => "A páxina de conexión",
+"New password" => "Novo contrasinal",
+"Reset password" => "Restablecer contrasinal",
+"Personal" => "Personal",
+"Users" => "Usuarios",
+"Apps" => "Aplicativos",
+"Admin" => "Admin",
+"Help" => "Axuda",
+"Cloud not found" => "Nube non atopada",
+"Create an <strong>admin account</strong>" => "Crear unha <strong>contra de administrador</strong>",
+"Password" => "Contrasinal",
+"Advanced" => "Avanzado",
+"Data folder" => "Cartafol de datos",
+"Configure the database" => "Configurar a base de datos",
+"will be used" => "será utilizado",
+"Database user" => "Usuario da base de datos",
+"Database password" => "Contrasinal da base de datos",
+"Database name" => "Nome da base de datos",
+"Database host" => "Servidor da base de datos",
+"Finish setup" => "Rematar configuración",
+"web services under your control" => "servizos web baixo o seu control",
+"Log out" => "Desconectar",
+"Settings" => "Preferencias",
+"Lost your password?" => "Perdéchelo contrasinal?",
+"remember" => "lembrar",
+"Log in" => "Conectar",
+"You are logged out." => "Está desconectado",
+"prev" => "anterior",
+"next" => "seguinte"
+);
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 1a63e7ea36e..02b7cb81078 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -7,7 +7,7 @@
 "Username" => "Nome utente",
 "Request reset" => "Richiesta di ripristino",
 "Your password was reset" => "La password è stata reimpostata",
-"To login page" => "Alla pagina di ingresso",
+"To login page" => "Alla pagina di login",
 "New password" => "Nuova password",
 "Reset password" => "Reimposta password",
 "Personal" => "Personale",
@@ -26,11 +26,11 @@
 "Database password" => "Password database",
 "Database name" => "Nome database",
 "Database host" => "Host del database",
-"Finish setup" => "Termina",
-"web services under your control" => "Servizi web nelle tue mani",
-"Log out" => "Log out",
+"Finish setup" => "Termina Configurazione",
+"web services under your control" => "servizi web nelle tue mani",
+"Log out" => "Esci",
 "Settings" => "Impostazioni",
-"Lost your password?" => "Password persa?",
+"Lost your password?" => "Hai perso la password?",
 "remember" => "ricorda",
 "Log in" => "Entra",
 "You are logged out." => "Sei uscito.",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 43d8ca7d5e0..11ad408b8e5 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Owncloud password reset" => "Obnova Owncloud hesla",
+"Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
 "You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte E-mailom.",
 "Requested" => "Požiadané",
 "Login failed!" => "Prihlásenie zlyhalo!",
 "Username" => "Prihlasovacie meno",
 "Request reset" => "Požiadať o obnovenie",
 "Your password was reset" => "Vaše heslo bolo obnovené",
+"To login page" => "Na prihlasovaciu stránku",
 "New password" => "Nové heslo",
 "Reset password" => "Obnova hesla",
 "Personal" => "Osobné",
@@ -24,10 +27,12 @@
 "Database name" => "Meno databázy",
 "Database host" => "Server databázy",
 "Finish setup" => "Dokončiť inštaláciu",
+"web services under your control" => "webové služby pod vašou kontrolou",
 "Log out" => "Odhlásiť",
 "Settings" => "Nastavenia",
 "Lost your password?" => "Zabudli ste heslo?",
 "remember" => "zapamätať",
+"Log in" => "Prihlásiť sa",
 "You are logged out." => "Ste odhlásený.",
 "prev" => "späť",
 "next" => "ďalej"
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 667a7b054c3..6bd6275df4b 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
+"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" => "Лична",
@@ -24,10 +27,12 @@
 "Database name" => "Име базе",
 "Database host" => "Домаћин базе",
 "Finish setup" => "Заврши подешавање",
+"web services under your control" => "веб сервиси под контролом",
 "Log out" => "Одјава",
 "Settings" => "Подешавања",
 "Lost your password?" => "Изгубили сте лозинку?",
 "remember" => "упамти",
+"Log in" => "Пријава",
 "You are logged out." => "Одјављени сте.",
 "prev" => "претходно",
 "next" => "следеће"
diff --git a/files/ajax/delete.php b/files/ajax/delete.php
index 48df5862db2..1725201fdd9 100644
--- a/files/ajax/delete.php
+++ b/files/ajax/delete.php
@@ -6,8 +6,8 @@ require_once('../../lib/base.php');
 OC_JSON::checkLoggedIn();
 
 // Get data
-$dir = $_GET["dir"];
-$files = isset($_GET["file"]) ? $_GET["file"] : $_GET["files"];
+$dir = stripslashes($_GET["dir"]);
+$files = isset($_GET["file"]) ? stripslashes($_GET["file"]) : stripslashes($_GET["files"]);
 
 $files = explode(';', $files);
 $filesWithError = '';
diff --git a/files/ajax/move.php b/files/ajax/move.php
index 3517901c6cf..9af3f80208f 100644
--- a/files/ajax/move.php
+++ b/files/ajax/move.php
@@ -6,9 +6,9 @@ require_once('../../lib/base.php');
 OC_JSON::checkLoggedIn();
 
 // Get data
-$dir = $_GET["dir"];
-$file = $_GET["file"];
-$target = $_GET["target"];
+$dir = stripslashes($_GET["dir"]);
+$file = stripslashes($_GET["file"]);
+$target = stripslashes($_GET["target"]);
 
 
 if(OC_Files::move($dir,$file,$target,$file)){
diff --git a/files/ajax/newfile.php b/files/ajax/newfile.php
index 5c4f49a3675..afc444bc0ac 100644
--- a/files/ajax/newfile.php
+++ b/files/ajax/newfile.php
@@ -6,8 +6,8 @@ require_once('../../lib/base.php');
 OC_JSON::checkLoggedIn();
 
 // Get the params
-$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
-$filename = isset( $_GET['filename'] ) ? $_GET['filename'] : '';
+$dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
+$filename = isset( $_GET['filename'] ) ? stripslashes($_GET['filename']) : '';
 $content = isset( $_GET['content'] ) ? $_GET['content'] : '';
 
 if($filename == '') {
@@ -24,4 +24,4 @@ if(OC_Files::newFile($dir, $filename, 'file')) {
 }
 
 
-OC_JSON::error(array("data" => array( "message" => "Error when creating the file" )));
\ No newline at end of file
+OC_JSON::error(array("data" => array( "message" => "Error when creating the file" )));
diff --git a/files/ajax/newfolder.php b/files/ajax/newfolder.php
index d244fb7be19..6db045c4e17 100644
--- a/files/ajax/newfolder.php
+++ b/files/ajax/newfolder.php
@@ -6,15 +6,15 @@ require_once('../../lib/base.php');
 OC_JSON::checkLoggedIn();
 
 // Get the params
-$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
-$foldername = isset( $_GET['foldername'] ) ? $_GET['foldername'] : '';
+$dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
+$foldername = isset( $_GET['foldername'] ) ? stripslashes($_GET['foldername']) : '';
 
 if(trim($foldername) == '') {
 	OC_JSON::error(array("data" => array( "message" => "Empty Foldername" )));
 	exit();
 }
 
-if(OC_Files::newFile($dir, $foldername, 'dir')) {
+if(OC_Files::newFile($dir, stripslashes($foldername), 'dir')) {
 	OC_JSON::success(array("data" => array()));
 	exit();
 }
diff --git a/files/ajax/rename.php b/files/ajax/rename.php
index 87ffbc3ada0..a51b36635b3 100644
--- a/files/ajax/rename.php
+++ b/files/ajax/rename.php
@@ -6,9 +6,9 @@ require_once('../../lib/base.php');
 OC_JSON::checkLoggedIn();
 
 // Get data
-$dir = $_GET["dir"];
-$file = $_GET["file"];
-$newname = $_GET["newname"];
+$dir = stripslashes($_GET["dir"]);
+$file = stripslashes($_GET["file"]);
+$newname = stripslashes($_GET["newname"]);
 
 // Delete
 if( OC_Files::move( $dir, $file, $dir, $newname )) {
diff --git a/files/index.php b/files/index.php
index 7f3c5c579e7..fbf7a4901a1 100644
--- a/files/index.php
+++ b/files/index.php
@@ -38,7 +38,7 @@ if(!isset($_SESSION['timezone'])){
 }
 OC_App::setActiveNavigationEntry( "files_index" );
 // Load the files
-$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
+$dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
 // Redirect if directory does not exist
 if(!OC_Filesystem::is_dir($dir)) {
 	header("Location: ".$_SERVER['PHP_SELF']."");
diff --git a/files/l10n/gl.php b/files/l10n/gl.php
new file mode 100644
index 00000000000..83cf93be795
--- /dev/null
+++ b/files/l10n/gl.php
@@ -0,0 +1,23 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Non hai erros, o ficheiro subeuse con éxito",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O ficheiro subido supera a directiva upload_max_filesize no php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro subido supera a directiva MAX_FILE_SIZE que foi indicada no formulario HTML",
+"The uploaded file was only partially uploaded" => "O ficheiro subido foi só parcialmente subido",
+"No file was uploaded" => "Non se subeu ningún ficheiro",
+"Missing a temporary folder" => "Falta un cartafol temporal",
+"Files" => "Ficheiros",
+"Maximum upload size" => "Tamaño máximo de subida",
+"New" => "Novo",
+"Text file" => "Ficheiro de texto",
+"Folder" => "Cartafol",
+"From the web" => "Desde a rede",
+"Upload" => "Subir",
+"Nothing in here. Upload something!" => "Nada por aquí. Sube algo!",
+"Name" => "Nome",
+"Download" => "Baixar",
+"Size" => "Tamaño",
+"Modified" => "Modificado",
+"Delete" => "Eliminar",
+"Upload too large" => "Subida demasiado grande",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que tratas de subir superan o tamaño máximo permitido neste servidor"
+);
diff --git a/files/l10n/sr.php b/files/l10n/sr.php
index 9c5dbae2a23..7e2ac3b1366 100644
--- a/files/l10n/sr.php
+++ b/files/l10n/sr.php
@@ -7,6 +7,10 @@
 "Missing a temporary folder" => "Недостаје привремена фасцикла",
 "Files" => "Фајлови",
 "Maximum upload size" => "Максимална величина пошиљке",
+"New" => "Нови",
+"Text file" => "текстуални фајл",
+"Folder" => "фасцикла",
+"From the web" => "са веба",
 "Upload" => "Пошаљи",
 "Nothing in here. Upload something!" => "Овде нема ничег. Пошаљите нешто!",
 "Name" => "Име",
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index ed62562f685..fc1c9e63f49 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/team/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "تم تغيير ال OpenID"
 msgid "Language changed"
 msgstr "تم تغيير اللغة"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index c5a72e79d81..7d72967afd9 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -35,6 +35,10 @@ msgstr "OpenID е сменено"
 msgid "Language changed"
 msgstr "Езика е сменен"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index 28a7aa018f8..95dd499ad42 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 21:19+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,47 +20,47 @@ msgstr ""
 
 #: ajax/activation.php:17 ajax/updateaddressbook.php:26
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "Error en (des)activar la llibreta d'adreces."
 
 #: ajax/addcard.php:79
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "S'ha produït un error en afegir el contacte."
 
 #: ajax/addproperty.php:39
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "No es pot afegir una propietat buida."
 
 #: ajax/addproperty.php:51
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "Almenys heu d'omplir un dels camps d'adreça."
 
 #: ajax/addproperty.php:77
 msgid "Error adding contact property."
-msgstr ""
+msgstr "Error en afegir la propietat del contacte."
 
 #: ajax/createaddressbook.php:20
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "Error en afegir la llibreta d'adreces."
 
 #: ajax/createaddressbook.php:26
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "Error en activar la llibreta d'adreces."
 
 #: ajax/deleteproperty.php:40
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Error en eliminar la propietat del contacte."
 
 #: ajax/setproperty.php:79
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Error en actualitzar la propietat del contacte."
 
 #: ajax/updateaddressbook.php:20
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Error en actualitzar la llibreta d'adreces."
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "Contactes"
 
 #: lib/app.php:42
 msgid "This is not your addressbook."
@@ -127,7 +127,7 @@ msgstr "Paginador"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Contacte"
 
 #: photo.php:40
 msgid "This is not your contact."
@@ -147,11 +147,11 @@ msgstr "Afegiu un contacte"
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "Llibretes d'adreces"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "Llibreta d'adreces"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
@@ -229,7 +229,7 @@ msgstr "Elimina"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "Baixa el contacte"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
@@ -241,11 +241,11 @@ msgstr "Afegeix"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Nova llibreta d'adreces"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Edita la llibreta d'adreces"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
@@ -285,6 +285,6 @@ msgstr "Actualitza"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
-msgstr ""
+msgstr "Adreça de sincronització CardDAV:"
 
 
diff --git a/l10n/ca/gallery.po b/l10n/ca/gallery.po
index b2c6ad5819a..f670a71c643 100644
--- a/l10n/ca/gallery.po
+++ b/l10n/ca/gallery.po
@@ -3,13 +3,14 @@
 # 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://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 21:20+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr ""
+msgstr "Galeria"
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Escaneja de nou"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Enrera"
 
 
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 9467158bd2f..2a6ff9d93c4 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-11 09:47+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,6 +34,10 @@ msgstr "OpenID ha canviat"
 msgid "Language changed"
 msgstr "S'ha canviat l'idioma"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Nivell de registres"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 0787bfd9ebd..c7a83f2562d 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-11 11:33+0000\n"
-"Last-Translator: Martin <fireball@atlas.cz>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,6 +35,10 @@ msgstr "OpenID změněn"
 msgid "Language changed"
 msgstr "Jazyk byl změněn"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Úroveň logu"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 0882ebc94e7..16570895369 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-13 22:44+0000\n"
-"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,6 +36,10 @@ msgstr "OpenID ændret"
 msgid "Language changed"
 msgstr "Sprog ændret"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Log-niveau"
diff --git a/l10n/de/calendar.po b/l10n/de/calendar.po
index 786f0329267..69e449ad01d 100644
--- a/l10n/de/calendar.po
+++ b/l10n/de/calendar.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <admin@s-goecker.de>, 2011.
+#   <admin@s-goecker.de>, 2011, 2012.
 #   <georg.stefan.germany@googlemail.com>, 2011, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: goeck <admin@s-goecker.de>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -344,79 +344,79 @@ msgstr "Fehler beim Einlesen der Datei."
 
 #: templates/lAfix.php:9
 msgid "Sun."
-msgstr ""
+msgstr "So"
 
 #: templates/lAfix.php:10
 msgid "Mon."
-msgstr ""
+msgstr "Mo"
 
 #: templates/lAfix.php:11
 msgid "Tue."
-msgstr ""
+msgstr "Die"
 
 #: templates/lAfix.php:12
 msgid "Wed."
-msgstr ""
+msgstr "Mi"
 
 #: templates/lAfix.php:13
 msgid "Thu."
-msgstr ""
+msgstr "Do"
 
 #: templates/lAfix.php:14
 msgid "Fri."
-msgstr ""
+msgstr "Fr"
 
 #: templates/lAfix.php:15
 msgid "Sat."
-msgstr ""
+msgstr "Sa"
 
 #: templates/lAfix.php:28
 msgid "Jan."
-msgstr ""
+msgstr "Jan"
 
 #: templates/lAfix.php:29
 msgid "Feb."
-msgstr ""
+msgstr "Feb"
 
 #: templates/lAfix.php:30
 msgid "Mar."
-msgstr ""
+msgstr "Mär"
 
 #: templates/lAfix.php:31
 msgid "Apr."
-msgstr ""
+msgstr "Apr"
 
 #: templates/lAfix.php:32
 msgid "May."
-msgstr ""
+msgstr "Mai"
 
 #: templates/lAfix.php:33
 msgid "Jun."
-msgstr ""
+msgstr "Juni"
 
 #: templates/lAfix.php:34
 msgid "Jul."
-msgstr ""
+msgstr "Juli"
 
 #: templates/lAfix.php:35
 msgid "Aug."
-msgstr ""
+msgstr "Aug"
 
 #: templates/lAfix.php:36
 msgid "Sep."
-msgstr ""
+msgstr "Sep"
 
 #: templates/lAfix.php:37
 msgid "Oct."
-msgstr ""
+msgstr "Okt"
 
 #: templates/lAfix.php:38
 msgid "Nov."
-msgstr ""
+msgstr "Nov"
 
 #: templates/lAfix.php:39
 msgid "Dec."
-msgstr ""
+msgstr "Dez"
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
diff --git a/l10n/de/gallery.po b/l10n/de/gallery.po
index 64f9f997230..0b37124c43c 100644
--- a/l10n/de/gallery.po
+++ b/l10n/de/gallery.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Bartek  <bart.p.pl@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 21:46+0000\n"
+"Last-Translator: Bartek <bart.p.pl@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr ""
+msgstr "Galerie"
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Rescan"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Zurück"
 
 
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 9db3b4cec9d..ffceebc7631 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-12 15:43+0000\n"
-"Last-Translator: piccobello <nelsonfritsch@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,6 +36,10 @@ msgstr "OpenID geändert"
 msgid "Language changed"
 msgstr "Sprache geändert"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 3ca09077e0b..f0eb55301ce 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-11 17:35+0000\n"
-"Last-Translator: Petros Kyladitis <petros.kyladitis@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,6 +35,10 @@ msgstr "Το OpenID άλλαξε"
 msgid "Language changed"
 msgstr "Η γλώσσα άλλαξε"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Επίπεδο καταγραφής"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index d99fbc60bd9..d328f0e09ee 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/team/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "La agordo de OpenID estas ŝanĝita"
 msgid "Language changed"
 msgstr "La lingvo estas ŝanĝita"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 9114f621f8c..10cfe0b5cb9 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-11 19:01+0000\n"
-"Last-Translator: xsergiolpx <sergioballesterossolanas@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,6 +37,10 @@ msgstr "OpenID Cambiado"
 msgid "Language changed"
 msgstr "Idioma cambiado"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Nivel de log"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 9de62de218d..a34a2a17c2b 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/team/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID on muudetud"
 msgid "Language changed"
 msgstr "Keel on muudetud"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index e4655b60a08..f70d37fbbd5 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/team/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID aldatuta"
 msgid "Language changed"
 msgstr "Hizkuntza aldatuta"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/fr/calendar.po b/l10n/fr/calendar.po
index 2b5623cf569..042d62856ad 100644
--- a/l10n/fr/calendar.po
+++ b/l10n/fr/calendar.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 14:20+0000\n"
+"Last-Translator: rom1dep <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -580,7 +580,7 @@ msgstr "Description de l'événement"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Importer un fichier de calendriers"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -588,11 +588,11 @@ msgstr "Choisissez le calendrier svp"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "Créer un nouveau calendrier"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Nom pour le nouveau calendrier"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -600,15 +600,15 @@ msgstr "Importer"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Import du calendrier"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Calendrier importé avec succès"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Fermer la fenêtre"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 90e4474072b..df10fd6b44e 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -6,14 +6,14 @@
 #   <fboulogne@april.org>, 2011.
 #   <gp4004@arghh.org>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
-#   <rom1dep@gmail.com>, 2011.
+#   <rom1dep@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 14:18+0000\n"
+"Last-Translator: rom1dep <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,46 +24,48 @@ msgstr ""
 #: ajax/activation.php:17 ajax/updateaddressbook.php:26
 msgid "Error (de)activating addressbook."
 msgstr ""
+"Des erreurs se sont produites lors de l'activation/désactivation du carnet "
+"d'adresses."
 
 #: ajax/addcard.php:79
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "Une erreur s'est produite lors de l'ajout du contact."
 
 #: ajax/addproperty.php:39
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "Impossible d'ajouter un champ vide."
 
 #: ajax/addproperty.php:51
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "Au moins un des champs d'adresses doit être complété."
 
 #: ajax/addproperty.php:77
 msgid "Error adding contact property."
-msgstr ""
+msgstr "Erreur lors de l'ajout du champ."
 
 #: ajax/createaddressbook.php:20
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "Erreur lors de l'ajout du carnet d'adresses."
 
 #: ajax/createaddressbook.php:26
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "Erreur lors de l'activation du carnet d'adresses."
 
 #: ajax/deleteproperty.php:40
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Erreur lors de la suppression du champ."
 
 #: ajax/setproperty.php:79
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Erreur lors de la mise à jour du champ."
 
 #: ajax/updateaddressbook.php:20
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Erreur lors de la mise à jour du carnet d'adresses."
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "Contacts"
 
 #: lib/app.php:42
 msgid "This is not your addressbook."
@@ -132,7 +134,7 @@ msgstr "Bipeur"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Contact"
 
 #: photo.php:40
 msgid "This is not your contact."
@@ -152,11 +154,11 @@ msgstr "Ajouter un Contact"
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "Carnets d'adresses"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "Carnet d'adresses"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
@@ -234,7 +236,7 @@ msgstr "Supprimer"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "Télécharger le contact"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
@@ -246,11 +248,11 @@ msgstr "Ajouter"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Nouveau carnet d'adresses"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Éditer le carnet d'adresses"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
@@ -290,6 +292,6 @@ msgstr "Enregistrer"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
-msgstr ""
+msgstr "Adresse de synchronisation CardDAV :"
 
 
diff --git a/l10n/fr/gallery.po b/l10n/fr/gallery.po
index f2a196d96b9..2d662af6e80 100644
--- a/l10n/fr/gallery.po
+++ b/l10n/fr/gallery.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 14:12+0000\n"
+"Last-Translator: rom1dep <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr ""
+msgstr "Galerie"
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Analyser à nouveau"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Retour"
 
 
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index a0a3373fba9..ca7d7a2b70e 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-11 20:18+0000\n"
-"Last-Translator: Borjan Tchakaloff <borjan@tchaka.fr>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,6 +36,10 @@ msgstr "Identifiant OpenID changé"
 msgid "Language changed"
 msgstr "Langue changée"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Niveau de log"
diff --git a/l10n/gl/calendar.po b/l10n/gl/calendar.po
index e4607d2f7d8..169607e0e8d 100644
--- a/l10n/gl/calendar.po
+++ b/l10n/gl/calendar.po
@@ -3,13 +3,14 @@
 # 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://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 07:09+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,40 +20,40 @@ msgstr ""
 
 #: ajax/guesstimezone.php:42
 msgid "New Timezone:"
-msgstr ""
+msgstr "Novo fuso horario:"
 
 #: ajax/settimezone.php:22
 msgid "Timezone changed"
-msgstr ""
+msgstr "Fuso horario trocado"
 
 #: ajax/settimezone.php:24
 msgid "Invalid request"
-msgstr ""
+msgstr "Petición non válida"
 
 #: appinfo/app.php:20 templates/calendar.php:13
 #: templates/part.eventform.php:20
 msgid "Calendar"
-msgstr ""
+msgstr "Calendario"
 
 #: lib/app.php:19
 msgid "Wrong calendar"
-msgstr ""
+msgstr "Calendario equivocado"
 
 #: lib/app.php:60 lib/object.php:332
 msgid "Birthday"
-msgstr ""
+msgstr "Cumpleanos"
 
 #: lib/app.php:61 lib/object.php:333
 msgid "Business"
-msgstr ""
+msgstr "Traballo"
 
 #: lib/app.php:62 lib/object.php:334
 msgid "Call"
-msgstr ""
+msgstr "Chamada"
 
 #: lib/app.php:63 lib/object.php:335
 msgid "Clients"
-msgstr ""
+msgstr "Clientes"
 
 #: lib/app.php:64 lib/object.php:336
 msgid "Deliverer"
@@ -60,577 +61,577 @@ msgstr ""
 
 #: lib/app.php:65 lib/object.php:337
 msgid "Holidays"
-msgstr ""
+msgstr "Vacacións"
 
 #: lib/app.php:66 lib/object.php:338
 msgid "Ideas"
-msgstr ""
+msgstr "Ideas"
 
 #: lib/app.php:67 lib/object.php:339
 msgid "Journey"
-msgstr ""
+msgstr "Viaxe"
 
 #: lib/app.php:68 lib/object.php:340
 msgid "Jubilee"
-msgstr ""
+msgstr "Aniversario"
 
 #: lib/app.php:69 lib/object.php:341
 msgid "Meeting"
-msgstr ""
+msgstr "Reunión"
 
 #: lib/app.php:70 lib/object.php:342
 msgid "Other"
-msgstr ""
+msgstr "Outro"
 
 #: lib/app.php:71 lib/object.php:343
 msgid "Personal"
-msgstr ""
+msgstr "Personal"
 
 #: lib/app.php:72 lib/object.php:344
 msgid "Projects"
-msgstr ""
+msgstr "Proxectos"
 
 #: lib/app.php:73 lib/object.php:345
 msgid "Questions"
-msgstr ""
+msgstr "Preguntas"
 
 #: lib/app.php:74 lib/object.php:346
 msgid "Work"
-msgstr ""
+msgstr "Traballo"
 
 #: lib/object.php:353
 msgid "Does not repeat"
-msgstr ""
+msgstr "Non se repite"
 
 #: lib/object.php:354
 msgid "Daily"
-msgstr ""
+msgstr "A diario"
 
 #: lib/object.php:355
 msgid "Weekly"
-msgstr ""
+msgstr "Semanalmente"
 
 #: lib/object.php:356
 msgid "Every Weekday"
-msgstr ""
+msgstr "Tódalas semanas"
 
 #: lib/object.php:357
 msgid "Bi-Weekly"
-msgstr ""
+msgstr "Cada dúas semanas"
 
 #: lib/object.php:358
 msgid "Monthly"
-msgstr ""
+msgstr "Mensualmente"
 
 #: lib/object.php:359
 msgid "Yearly"
-msgstr ""
+msgstr "Anual"
 
 #: lib/object.php:366
 msgid "never"
-msgstr ""
+msgstr "nunca"
 
 #: lib/object.php:367
 msgid "by occurrences"
-msgstr ""
+msgstr "por acontecementos"
 
 #: lib/object.php:368
 msgid "by date"
-msgstr ""
+msgstr "por data"
 
 #: lib/object.php:375
 msgid "by monthday"
-msgstr ""
+msgstr "por día do mes"
 
 #: lib/object.php:376
 msgid "by weekday"
-msgstr ""
+msgstr "por día da semana"
 
 #: lib/object.php:383 templates/lAfix.php:3
 msgid "Monday"
-msgstr ""
+msgstr "Luns"
 
 #: lib/object.php:384 templates/lAfix.php:4
 msgid "Tuesday"
-msgstr ""
+msgstr "Martes"
 
 #: lib/object.php:385 templates/lAfix.php:5
 msgid "Wednesday"
-msgstr ""
+msgstr "Mércores"
 
 #: lib/object.php:386 templates/lAfix.php:6
 msgid "Thursday"
-msgstr ""
+msgstr "Xoves"
 
 #: lib/object.php:387 templates/lAfix.php:7
 msgid "Friday"
-msgstr ""
+msgstr "Venres"
 
 #: lib/object.php:388 templates/lAfix.php:8
 msgid "Saturday"
-msgstr ""
+msgstr "Sábado"
 
 #: lib/object.php:389 templates/lAfix.php:2
 msgid "Sunday"
-msgstr ""
+msgstr "Domingo"
 
 #: lib/object.php:396
 msgid "events week of month"
-msgstr ""
+msgstr "semana dos eventos no mes"
 
 #: lib/object.php:397
 msgid "first"
-msgstr ""
+msgstr "primeiro"
 
 #: lib/object.php:398
 msgid "second"
-msgstr ""
+msgstr "segundo"
 
 #: lib/object.php:399
 msgid "third"
-msgstr ""
+msgstr "terceiro"
 
 #: lib/object.php:400
 msgid "fourth"
-msgstr ""
+msgstr "cuarto"
 
 #: lib/object.php:401
 msgid "fifth"
-msgstr ""
+msgstr "quinto"
 
 #: lib/object.php:402
 msgid "last"
-msgstr ""
+msgstr "último"
 
 #: lib/object.php:424 templates/lAfix.php:16
 msgid "January"
-msgstr ""
+msgstr "Xaneiro"
 
 #: lib/object.php:425 templates/lAfix.php:17
 msgid "February"
-msgstr ""
+msgstr "Febreiro"
 
 #: lib/object.php:426 templates/lAfix.php:18
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #: lib/object.php:427 templates/lAfix.php:19
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #: lib/object.php:428 templates/lAfix.php:20
 msgid "May"
-msgstr ""
+msgstr "Maio"
 
 #: lib/object.php:429 templates/lAfix.php:21
 msgid "June"
-msgstr ""
+msgstr "Xuño"
 
 #: lib/object.php:430 templates/lAfix.php:22
 msgid "July"
-msgstr ""
+msgstr "Xullo"
 
 #: lib/object.php:431 templates/lAfix.php:23
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #: lib/object.php:432 templates/lAfix.php:24
 msgid "September"
-msgstr ""
+msgstr "Setembro"
 
 #: lib/object.php:433 templates/lAfix.php:25
 msgid "October"
-msgstr ""
+msgstr "Outubro"
 
 #: lib/object.php:434 templates/lAfix.php:26
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
 #: lib/object.php:435 templates/lAfix.php:27
 msgid "December"
-msgstr ""
+msgstr "Nadal"
 
 #: lib/object.php:441
 msgid "by events date"
-msgstr ""
+msgstr "por data dos eventos"
 
 #: lib/object.php:442
 msgid "by yearday(s)"
-msgstr ""
+msgstr "por dia(s) do ano"
 
 #: lib/object.php:443
 msgid "by weeknumber(s)"
-msgstr ""
+msgstr "por número(s) de semana"
 
 #: lib/object.php:444
 msgid "by day and month"
-msgstr ""
+msgstr "por día e mes"
 
 #: lib/object.php:467
 msgid "Not an array"
-msgstr ""
+msgstr "Non é un conxunto"
 
 #: lib/search.php:32 lib/search.php:34 lib/search.php:37
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #: lib/search.php:40
 msgid "Cal."
-msgstr ""
+msgstr "Cal."
 
 #: templates/calendar.php:10
 msgid "All day"
-msgstr ""
+msgstr "Todo o dia"
 
 #: templates/calendar.php:11
 msgid "Missing fields"
-msgstr ""
+msgstr "Faltan campos"
 
 #: templates/calendar.php:12 templates/part.eventform.php:3
 msgid "Title"
-msgstr ""
+msgstr "Título"
 
 #: templates/calendar.php:14
 msgid "From Date"
-msgstr ""
+msgstr "Desde Data"
 
 #: templates/calendar.php:15
 msgid "From Time"
-msgstr ""
+msgstr "Desde Hora"
 
 #: templates/calendar.php:16
 msgid "To Date"
-msgstr ""
+msgstr "a Data"
 
 #: templates/calendar.php:17
 msgid "To Time"
-msgstr ""
+msgstr "a Hora"
 
 #: templates/calendar.php:18
 msgid "The event ends before it starts"
-msgstr ""
+msgstr "O evento remata antes de iniciarse"
 
 #: templates/calendar.php:19
 msgid "There was a database fail"
-msgstr ""
+msgstr "Houbo un erro na base de datos"
 
 #: templates/calendar.php:52
 msgid "Week"
-msgstr ""
+msgstr "Semana"
 
 #: templates/calendar.php:53
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #: templates/calendar.php:54
 msgid "List"
-msgstr ""
+msgstr "Lista"
 
 #: templates/calendar.php:59
 msgid "Today"
-msgstr ""
+msgstr "Hoxe"
 
 #: templates/calendar.php:60
 msgid "Calendars"
-msgstr ""
+msgstr "Calendarios"
 
 #: templates/calendar.php:78
 msgid "There was a fail, while parsing the file."
-msgstr ""
+msgstr "Houbo un erro ao procesar o ficheiro"
 
 #: templates/lAfix.php:9
 msgid "Sun."
-msgstr ""
+msgstr "Dom."
 
 #: templates/lAfix.php:10
 msgid "Mon."
-msgstr ""
+msgstr "Lun."
 
 #: templates/lAfix.php:11
 msgid "Tue."
-msgstr ""
+msgstr "Mar."
 
 #: templates/lAfix.php:12
 msgid "Wed."
-msgstr ""
+msgstr "Mer."
 
 #: templates/lAfix.php:13
 msgid "Thu."
-msgstr ""
+msgstr "Xov."
 
 #: templates/lAfix.php:14
 msgid "Fri."
-msgstr ""
+msgstr "Ven."
 
 #: templates/lAfix.php:15
 msgid "Sat."
-msgstr ""
+msgstr "Sáb."
 
 #: templates/lAfix.php:28
 msgid "Jan."
-msgstr ""
+msgstr "Xan."
 
 #: templates/lAfix.php:29
 msgid "Feb."
-msgstr ""
+msgstr "Feb."
 
 #: templates/lAfix.php:30
 msgid "Mar."
-msgstr ""
+msgstr "Mar."
 
 #: templates/lAfix.php:31
 msgid "Apr."
-msgstr ""
+msgstr "Abr."
 
 #: templates/lAfix.php:32
 msgid "May."
-msgstr ""
+msgstr "Mai."
 
 #: templates/lAfix.php:33
 msgid "Jun."
-msgstr ""
+msgstr "Xuñ."
 
 #: templates/lAfix.php:34
 msgid "Jul."
-msgstr ""
+msgstr "Xul."
 
 #: templates/lAfix.php:35
 msgid "Aug."
-msgstr ""
+msgstr "Ago."
 
 #: templates/lAfix.php:36
 msgid "Sep."
-msgstr ""
+msgstr "Set."
 
 #: templates/lAfix.php:37
 msgid "Oct."
-msgstr ""
+msgstr "Out."
 
 #: templates/lAfix.php:38
 msgid "Nov."
-msgstr ""
+msgstr "Nov."
 
 #: templates/lAfix.php:39
 msgid "Dec."
-msgstr ""
+msgstr "Nad."
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
-msgstr ""
+msgstr "Escolla os calendarios activos"
 
 #: templates/part.choosecalendar.php:15
 msgid "New Calendar"
-msgstr ""
+msgstr "Novo calendario"
 
 #: templates/part.choosecalendar.php:20
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "CalDav Link"
-msgstr ""
+msgstr "Ligazón CalDav"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Download"
-msgstr ""
+msgstr "Baixar"
 
 #: templates/part.choosecalendar.rowfields.php:4
 msgid "Edit"
-msgstr ""
+msgstr "Editar"
 
 #: templates/part.choosecalendar.rowfields.php:4
 #: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Borrar"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr ""
+msgstr "Novo calendario"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
-msgstr ""
+msgstr "Editar calendario"
 
 #: templates/part.editcalendar.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Mostrar nome"
 
 #: templates/part.editcalendar.php:23
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #: templates/part.editcalendar.php:29
 msgid "Calendar color"
-msgstr ""
+msgstr "Cor do calendario"
 
 #: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "Gardar"
 
 #: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Enviar"
 
 #: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #: templates/part.editevent.php:1
 msgid "Edit an event"
-msgstr ""
+msgstr "Editar un evento"
 
 #: templates/part.editevent.php:10
 msgid "Export"
-msgstr ""
+msgstr "Exportar"
 
 #: templates/part.eventform.php:5
 msgid "Title of the Event"
-msgstr ""
+msgstr "Título do evento"
 
 #: templates/part.eventform.php:11
 msgid "Category"
-msgstr ""
+msgstr "Categoría"
 
 #: templates/part.eventform.php:13
 msgid "Select category"
-msgstr ""
+msgstr "Seleccionar categoría"
 
 #: templates/part.eventform.php:37
 msgid "All Day Event"
-msgstr ""
+msgstr "Evento para todo o día"
 
 #: templates/part.eventform.php:41
 msgid "From"
-msgstr ""
+msgstr "Desde"
 
 #: templates/part.eventform.php:49
 msgid "To"
-msgstr ""
+msgstr "Para"
 
 #: templates/part.eventform.php:57
 msgid "Advanced options"
-msgstr ""
+msgstr "Opcións avanzadas"
 
 #: templates/part.eventform.php:61
 msgid "Repeat"
-msgstr ""
+msgstr "Repetir"
 
 #: templates/part.eventform.php:68
 msgid "Advanced"
-msgstr ""
+msgstr "Avanzado"
 
 #: templates/part.eventform.php:112
 msgid "Select weekdays"
-msgstr ""
+msgstr "Seleccionar días da semana"
 
 #: templates/part.eventform.php:125 templates/part.eventform.php:138
 msgid "Select days"
-msgstr ""
+msgstr "Seleccionar días"
 
 #: templates/part.eventform.php:130
 msgid "and the events day of year."
-msgstr ""
+msgstr "e día dos eventos no ano."
 
 #: templates/part.eventform.php:143
 msgid "and the events day of month."
-msgstr ""
+msgstr "e día dos eventos no mes."
 
 #: templates/part.eventform.php:151
 msgid "Select months"
-msgstr ""
+msgstr "Seleccione meses"
 
 #: templates/part.eventform.php:164
 msgid "Select weeks"
-msgstr ""
+msgstr "Seleccione semanas"
 
 #: templates/part.eventform.php:169
 msgid "and the events week of year."
-msgstr ""
+msgstr "e semana dos eventos no ano."
 
 #: templates/part.eventform.php:175
 msgid "Interval"
-msgstr ""
+msgstr "Intervalo"
 
 #: templates/part.eventform.php:181
 msgid "End"
-msgstr ""
+msgstr "Fin"
 
 #: templates/part.eventform.php:193
 msgid "occurrences"
-msgstr ""
+msgstr "acontecementos"
 
 #: templates/part.eventform.php:208
 msgid "Location"
-msgstr ""
+msgstr "Localización"
 
 #: templates/part.eventform.php:210
 msgid "Location of the Event"
-msgstr ""
+msgstr "Localización do evento"
 
 #: templates/part.eventform.php:216
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
 #: templates/part.eventform.php:218
 msgid "Description of the Event"
-msgstr ""
+msgstr "Descripción do evento"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Importar ficheiro de calendario"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
-msgstr ""
+msgstr "Por favor, seleccione o calendario"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "crear un novo calendario"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Nome do novo calendario"
 
 #: templates/part.import.php:17
 msgid "Import"
-msgstr ""
+msgstr "Importar"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Importar calendario"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Calendario importado con éxito"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Pechar cadro"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
-msgstr ""
+msgstr "Crear un novo evento"
 
 #: templates/settings.php:13
 msgid "Timezone"
-msgstr ""
+msgstr "Fuso horario"
 
 #: templates/settings.php:30
 msgid "Check always for changes of the timezone"
-msgstr ""
+msgstr "Comprobar sempre cambios de fuso horario"
 
 #: templates/settings.php:32
 msgid "Timeformat"
-msgstr ""
+msgstr "Formato de hora"
 
 #: templates/settings.php:34
 msgid "24h"
-msgstr ""
+msgstr "24h"
 
 #: templates/settings.php:35
 msgid "12h"
-msgstr ""
+msgstr "12h"
 
 #: templates/settings.php:41
 msgid "Calendar CalDAV syncing address:"
-msgstr ""
+msgstr "Dirección de sincronización do calendario CalDAV:"
 
 
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index a5df9ac8e9a..cfec12a1886 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.po
@@ -3,13 +3,14 @@
 # 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://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 06:44+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,271 +20,272 @@ msgstr ""
 
 #: ajax/activation.php:17 ajax/updateaddressbook.php:26
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "Erro (des)activando o directorio"
 
 #: ajax/addcard.php:79
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "Houbo un erro engadindo o contacto"
 
 #: ajax/addproperty.php:39
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "Non se pode engadir unha propiedade baldeira"
 
 #: ajax/addproperty.php:51
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "A lo menos un dos campos de dirección ten que ser cuberto"
 
 #: ajax/addproperty.php:77
 msgid "Error adding contact property."
-msgstr ""
+msgstr "Erro engadindo unha propiedade do contacto."
 
 #: ajax/createaddressbook.php:20
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "Erro engadindo directorio."
 
 #: ajax/createaddressbook.php:26
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "Erro activando o directorio."
 
 #: ajax/deleteproperty.php:40
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Erro borrando propiedade do contacto."
 
 #: ajax/setproperty.php:79
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Erro actualizando a propiedade do contacto."
 
 #: ajax/updateaddressbook.php:20
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Erro actualizando o directorio."
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "Contactos"
 
 #: lib/app.php:42
 msgid "This is not your addressbook."
-msgstr ""
+msgstr "Este non é o seu directorio"
 
 #: lib/app.php:51 photo.php:34
 msgid "Contact could not be found."
-msgstr ""
+msgstr "Non se atopou o contacto"
 
 #: lib/app.php:79
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
+"A información sobre a vCard é incorrecta. Por favor volte a cargar a páxina."
 
 #: lib/app.php:91 templates/part.addcardform.php:54
 #: templates/part.property.php:45 templates/part.setpropertyform.php:7
 msgid "Address"
-msgstr ""
+msgstr "Dirección"
 
 #: lib/app.php:92 templates/part.addcardform.php:43
 msgid "Telephone"
-msgstr ""
+msgstr "Teléfono"
 
 #: lib/app.php:93 templates/part.addcardform.php:37
 #: templates/part.property.php:16 templates/part.setpropertyform.php:51
 msgid "Email"
-msgstr ""
+msgstr "Correo electrónico"
 
 #: lib/app.php:94 templates/part.addcardform.php:27
 #: templates/part.property.php:9 templates/part.setpropertyform.php:54
 msgid "Organization"
-msgstr ""
+msgstr "Organización"
 
 #: lib/app.php:106 lib/app.php:113
 msgid "Work"
-msgstr ""
+msgstr "Emprego"
 
 #: lib/app.php:107 lib/app.php:111
 msgid "Home"
-msgstr ""
+msgstr "Casa"
 
 #: lib/app.php:112
 msgid "Mobile"
-msgstr ""
+msgstr "Móbil"
 
 #: lib/app.php:114
 msgid "Text"
-msgstr ""
+msgstr "Texto"
 
 #: lib/app.php:115
 msgid "Voice"
-msgstr ""
+msgstr "Voz"
 
 #: lib/app.php:116
 msgid "Fax"
-msgstr ""
+msgstr "Fax"
 
 #: lib/app.php:117
 msgid "Video"
-msgstr ""
+msgstr "Vídeo"
 
 #: lib/app.php:118
 msgid "Pager"
-msgstr ""
+msgstr "Paxinador"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Contacto"
 
 #: photo.php:40
 msgid "This is not your contact."
-msgstr ""
+msgstr "Este non é un dos seus contactos"
 
 #: photo.php:48
 msgid "This card is not RFC compatible."
-msgstr ""
+msgstr "Esta tarxeta non é compatible con RFC"
 
 #: photo.php:85
 msgid "This card does not contain a photo."
-msgstr ""
+msgstr "Esta tarxeta non ten fotografía"
 
 #: templates/index.php:6
 msgid "Add Contact"
-msgstr ""
+msgstr "Engadir contacto"
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "Directorios"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "Directorio"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #: templates/part.addcardform.php:57 templates/part.details.php:43
 #: templates/part.details.php:79 templates/part.setpropertyform.php:10
 #: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "Escriba"
 
 #: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
 msgid "PO Box"
-msgstr ""
+msgstr "Apartado de Correos"
 
 #: templates/part.addcardform.php:72 templates/part.details.php:53
 #: templates/part.setpropertyform.php:20
 msgid "Extended"
-msgstr ""
+msgstr "Extendido"
 
 #: templates/part.addcardform.php:78 templates/part.details.php:57
 #: templates/part.setpropertyform.php:24
 msgid "Street"
-msgstr ""
+msgstr "Rúa"
 
 #: templates/part.addcardform.php:84 templates/part.details.php:61
 #: templates/part.setpropertyform.php:28
 msgid "City"
-msgstr ""
+msgstr "Cidade"
 
 #: templates/part.addcardform.php:90 templates/part.details.php:65
 #: templates/part.setpropertyform.php:32
 msgid "Region"
-msgstr ""
+msgstr "Rexión"
 
 #: templates/part.addcardform.php:96 templates/part.details.php:69
 #: templates/part.setpropertyform.php:36
 msgid "Zipcode"
-msgstr ""
+msgstr "Código Postal"
 
 #: templates/part.addcardform.php:102 templates/part.details.php:73
 #: templates/part.setpropertyform.php:40
 msgid "Country"
-msgstr ""
+msgstr "País"
 
 #: templates/part.addcardform.php:109
 msgid "Create Contact"
-msgstr ""
+msgstr "Crear contacto"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "Escolla os Directorios Activos"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
-msgstr ""
+msgstr "Novo Directorio"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "CardDav Link"
-msgstr ""
+msgstr "Ligazón CardDav"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "Baixar"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
-msgstr ""
+msgstr "Editar"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Delete"
-msgstr ""
+msgstr "Eliminar"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "Descargar contacto"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
-msgstr ""
+msgstr "Borrar contacto"
 
 #: templates/part.details.php:34
 msgid "Add"
-msgstr ""
+msgstr "Engadir"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Novo Directorio"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Editar Directorio"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Mostrar nome"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Gardar"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Enviar"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #: templates/part.property.php:3
 msgid "Birthday"
-msgstr ""
+msgstr "Cumpleanos"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "Preferido"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
-msgstr ""
+msgstr "Teléfono"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
-msgstr ""
+msgstr "Actualizar"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
-msgstr ""
+msgstr "Dirección de sincronización CardDAV:"
 
 
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index aabdef11038..f2ae34598d4 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -3,13 +3,14 @@
 # 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://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 05:42+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,152 +20,153 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Restablecemento do contrasinal de Owncloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Use a seguinte ligazón para restablecer o contrasinal: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
+"Recibirás unha ligazón por correo electrónico para restablecer o contrasinal"
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Requested"
-msgstr ""
+msgstr "Solicitado"
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Login failed!"
-msgstr ""
+msgstr "Fallou a conexión!"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:22
 #: templates/login.php:8
 msgid "Username"
-msgstr ""
+msgstr "Nome de usuario"
 
 #: lostpassword/templates/lostpassword.php:14
 msgid "Request reset"
-msgstr ""
+msgstr "Petición de restablecemento"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr ""
+msgstr "O contrasinal foi restablecido"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "A páxina de conexión"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr ""
+msgstr "Novo contrasinal"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr ""
+msgstr "Restablecer contrasinal"
 
 #: strings.php:5
 msgid "Personal"
-msgstr ""
+msgstr "Personal"
 
 #: strings.php:6
 msgid "Users"
-msgstr ""
+msgstr "Usuarios"
 
 #: strings.php:7
 msgid "Apps"
-msgstr ""
+msgstr "Aplicativos"
 
 #: strings.php:8
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: strings.php:9
 msgid "Help"
-msgstr ""
+msgstr "Axuda"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr ""
+msgstr "Nube non atopada"
 
 #: templates/installation.php:20
 msgid "Create an <strong>admin account</strong>"
-msgstr ""
+msgstr "Crear unha <strong>contra de administrador</strong>"
 
 #: templates/installation.php:26 templates/login.php:12
 msgid "Password"
-msgstr ""
+msgstr "Contrasinal"
 
 #: templates/installation.php:32
 msgid "Advanced"
-msgstr ""
+msgstr "Avanzado"
 
 #: templates/installation.php:34
 msgid "Data folder"
-msgstr ""
+msgstr "Cartafol de datos"
 
 #: templates/installation.php:41
 msgid "Configure the database"
-msgstr ""
+msgstr "Configurar a base de datos"
 
 #: templates/installation.php:46 templates/installation.php:57
 #: templates/installation.php:67
 msgid "will be used"
-msgstr ""
+msgstr "será utilizado"
 
 #: templates/installation.php:79
 msgid "Database user"
-msgstr ""
+msgstr "Usuario da base de datos"
 
 #: templates/installation.php:83
 msgid "Database password"
-msgstr ""
+msgstr "Contrasinal da base de datos"
 
 #: templates/installation.php:87
 msgid "Database name"
-msgstr ""
+msgstr "Nome da base de datos"
 
 #: templates/installation.php:93
 msgid "Database host"
-msgstr ""
+msgstr "Servidor da base de datos"
 
 #: templates/installation.php:98
 msgid "Finish setup"
-msgstr ""
+msgstr "Rematar configuración"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "servizos web baixo o seu control"
 
 #: templates/layout.user.php:34
 msgid "Log out"
-msgstr ""
+msgstr "Desconectar"
 
 #: templates/layout.user.php:46 templates/layout.user.php:47
 msgid "Settings"
-msgstr ""
+msgstr "Preferencias"
 
 #: templates/login.php:5
 msgid "Lost your password?"
-msgstr ""
+msgstr "Perdéchelo contrasinal?"
 
 #: templates/login.php:15
 msgid "remember"
-msgstr ""
+msgstr "lembrar"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Conectar"
 
 #: templates/logout.php:1
 msgid "You are logged out."
-msgstr ""
+msgstr "Está desconectado"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
-msgstr ""
+msgstr "anterior"
 
 #: templates/part.pagenavi.php:20
 msgid "next"
-msgstr ""
+msgstr "seguinte"
 
 
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 164a7125e91..9b2c1ab8fb5 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -3,13 +3,14 @@
 # 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://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 05:52+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,90 +20,94 @@ msgstr ""
 
 #: ajax/upload.php:19
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Non hai erros, o ficheiro subeuse con éxito"
 
 #: ajax/upload.php:20
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "O ficheiro subido supera a directiva upload_max_filesize no php.ini"
 
 #: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
+"O ficheiro subido supera a directiva MAX_FILE_SIZE que foi indicada no "
+"formulario HTML"
 
 #: ajax/upload.php:22
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "O ficheiro subido foi só parcialmente subido"
 
 #: ajax/upload.php:23
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Non se subeu ningún ficheiro"
 
 #: ajax/upload.php:24
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Falta un cartafol temporal"
 
 #: appinfo/app.php:8
 msgid "Files"
-msgstr ""
+msgstr "Ficheiros"
 
 #: templates/admin.php:5
 msgid "Maximum upload size"
-msgstr ""
+msgstr "Tamaño máximo de subida"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "Ficheiro de texto"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "Cartafol"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "Desde a rede"
 
 #: templates/index.php:22
 msgid "Upload"
-msgstr ""
+msgstr "Subir"
 
 #: templates/index.php:35
 msgid "Nothing in here. Upload something!"
-msgstr ""
+msgstr "Nada por aquí. Sube algo!"
 
 #: templates/index.php:43
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #: templates/index.php:45
 msgid "Download"
-msgstr ""
+msgstr "Baixar"
 
 #: templates/index.php:49
 msgid "Size"
-msgstr ""
+msgstr "Tamaño"
 
 #: templates/index.php:50
 msgid "Modified"
-msgstr ""
+msgstr "Modificado"
 
 #: templates/index.php:50
 msgid "Delete"
-msgstr ""
+msgstr "Eliminar"
 
 #: templates/index.php:58
 msgid "Upload too large"
-msgstr ""
+msgstr "Subida demasiado grande"
 
 #: templates/index.php:60
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
+"Os ficheiros que tratas de subir superan o tamaño máximo permitido neste "
+"servidor"
 
 
diff --git a/l10n/gl/gallery.po b/l10n/gl/gallery.po
index ec369f59cb9..4c8e3d36824 100644
--- a/l10n/gl/gallery.po
+++ b/l10n/gl/gallery.po
@@ -3,13 +3,14 @@
 # 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://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 05:44+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr ""
+msgstr "Galería"
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Voltar a analizar"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Atrás"
 
 
diff --git a/l10n/gl/media.po b/l10n/gl/media.po
index 66a58f40a80..dfd0987c76a 100644
--- a/l10n/gl/media.po
+++ b/l10n/gl/media.po
@@ -3,13 +3,14 @@
 # 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://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 06:13+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,46 +20,46 @@ msgstr ""
 
 #: appinfo/app.php:32 templates/player.php:9
 msgid "Music"
-msgstr ""
+msgstr "Música"
 
 #: templates/music.php:3 templates/player.php:13
 msgid "Play"
-msgstr ""
+msgstr "Reproducir"
 
 #: templates/music.php:4 templates/music.php:26 templates/player.php:14
 msgid "Pause"
-msgstr ""
+msgstr "Pausa"
 
 #: templates/music.php:5
 msgid "Previous"
-msgstr ""
+msgstr "Anterior"
 
 #: templates/music.php:6 templates/player.php:15
 msgid "Next"
-msgstr ""
+msgstr "Seguinte"
 
 #: templates/music.php:7
 msgid "Mute"
-msgstr ""
+msgstr "Silenciar"
 
 #: templates/music.php:8
 msgid "Unmute"
-msgstr ""
+msgstr "Restaurar volume"
 
 #: templates/music.php:25
 msgid "Rescan Collection"
-msgstr ""
+msgstr "Voltar a analizar a Colección"
 
 #: templates/music.php:37
 msgid "Artist"
-msgstr ""
+msgstr "Artista"
 
 #: templates/music.php:38
 msgid "Album"
-msgstr ""
+msgstr "Album"
 
 #: templates/music.php:39
 msgid "Title"
-msgstr ""
+msgstr "Título"
 
 
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 2cb16dd7c32..89e3031013f 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -3,13 +3,14 @@
 # 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://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/team/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,134 +20,141 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "Correo electrónico mudado"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
-msgstr ""
+msgstr "Petición non correcta"
 
 #: ajax/openid.php:15
 msgid "OpenID Changed"
-msgstr ""
+msgstr "Mudou o OpenID"
 
 #: ajax/setlanguage.php:14
 msgid "Language changed"
+msgstr "O idioma mudou"
+
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
 msgstr ""
 
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "Nivel de rexistro"
 
 #: templates/apps.php:8
 msgid "Add your application"
-msgstr ""
+msgstr "Engada o seu aplicativo"
 
 #: templates/apps.php:21
 msgid "Select an App"
-msgstr ""
+msgstr "Escolla un Aplicativo"
 
 #: templates/apps.php:23
 msgid "-licensed"
-msgstr ""
+msgstr "-autorizado"
 
 #: templates/apps.php:23
 msgid "by"
-msgstr ""
+msgstr "por"
 
 #: templates/help.php:8
 msgid "Ask a question"
-msgstr ""
+msgstr "Pregunte"
 
 #: templates/help.php:20
 msgid "Problems connecting to help database."
-msgstr ""
+msgstr "Problemas conectando coa base de datos de axuda"
 
 #: templates/help.php:21
 msgid "Go there manually."
-msgstr ""
+msgstr "Ir manualmente"
 
 #: templates/help.php:29
 msgid "Answer"
-msgstr ""
+msgstr "Resposta"
 
 #: templates/personal.php:8
 msgid "You use"
-msgstr ""
+msgstr "Vostede usa"
 
 #: templates/personal.php:8
 msgid "of the available"
-msgstr ""
+msgstr "dun total de"
 
 #: templates/personal.php:13
 msgid "Your password got changed"
-msgstr ""
+msgstr "O seu contrasinal mudou"
 
 #: templates/personal.php:14
 msgid "Unable to change your password"
-msgstr ""
+msgstr "Incapaz de trocar o seu contrasinal"
 
 #: templates/personal.php:15
 msgid "Current password"
-msgstr ""
+msgstr "Contrasinal actual"
 
 #: templates/personal.php:16
 msgid "New password"
-msgstr ""
+msgstr "Novo contrasinal"
 
 #: templates/personal.php:17
 msgid "show"
-msgstr ""
+msgstr "amosar"
 
 #: templates/personal.php:18
 msgid "Change password"
-msgstr ""
+msgstr "Mudar contrasinal"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "Correo electrónico"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "A súa dirección de correo electrónico"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
+"Escriba unha dirección de correo electrónico para habilitar a recuperación "
+"do contrasinal"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
-msgstr ""
+msgstr "Idioma"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "Axude na tradución"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
+"utilice esta dirección para conectar o teu ownCloud no xestor de ficheiros"
 
 #: templates/users.php:15 templates/users.php:30
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #: templates/users.php:16 templates/users.php:31
 msgid "Password"
-msgstr ""
+msgstr "Contrasinal"
 
 #: templates/users.php:17 templates/users.php:32 templates/users.php:46
 msgid "Groups"
-msgstr ""
+msgstr "Grupos"
 
 #: templates/users.php:23
 msgid "Create"
-msgstr ""
+msgstr "Crear"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "Quota"
 
 #: templates/users.php:58
 msgid "Delete"
-msgstr ""
+msgstr "Borrar"
 
 
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 7941f186486..18942597800 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/team/he/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID השתנה"
 msgid "Language changed"
 msgstr "שפה השתנתה"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index c40085592cb..ddbabacd91e 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/team/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID promijenjen"
 msgid "Language changed"
 msgstr "Jezik promijenjen"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index d91ad225434..6ef3e534c2e 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/team/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID megváltozott"
 msgid "Language changed"
 msgstr "A nyelv megváltozott"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 7712776cd67..b2f41ef5227 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://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/team/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -33,6 +33,10 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index b05a2f18bb6..22d5293baea 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/team/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID cambiate"
 msgid "Language changed"
 msgstr "Linguage cambiate"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 19c8fb9ec9c..f27ff1d979a 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/team/id/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID telah dirubah"
 msgid "Language changed"
 msgstr "Bahasa telah diganti"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/it/calendar.po b/l10n/it/calendar.po
index cd96af7425d..8cd693ff57f 100644
--- a/l10n/it/calendar.po
+++ b/l10n/it/calendar.po
@@ -5,6 +5,7 @@
 # Translators:
 # Andrea Scarpino <andrea@archlinux.org>, 2011.
 #   <cosenal@gmail.com>, 2011.
+#   <formalist@email.it>, 2012.
 # Francesco Apruzzese <cescoap@gmail.com>, 2011.
 # Lorenzo Beltrami <lorenzo.beba@gmail.com>, 2011.
 #   <marco@carnazzo.it>, 2011, 2012.
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 17:18+0000\n"
+"Last-Translator: formalist <formalist@email.it>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -182,7 +183,7 @@ msgstr "Domenica"
 
 #: lib/object.php:396
 msgid "events week of month"
-msgstr ""
+msgstr "settimana del mese degli eventi"
 
 #: lib/object.php:397
 msgid "first"
@@ -258,19 +259,19 @@ msgstr "Dicembre"
 
 #: lib/object.php:441
 msgid "by events date"
-msgstr ""
+msgstr "per data evento"
 
 #: lib/object.php:442
 msgid "by yearday(s)"
-msgstr ""
+msgstr "per giorno/i dell'anno"
 
 #: lib/object.php:443
 msgid "by weeknumber(s)"
-msgstr ""
+msgstr "per numero/i settimana"
 
 #: lib/object.php:444
 msgid "by day and month"
-msgstr ""
+msgstr "per giorno e mese"
 
 #: lib/object.php:467
 msgid "Not an array"
@@ -346,79 +347,79 @@ msgstr "C'è stato un errore nel parsing del file."
 
 #: templates/lAfix.php:9
 msgid "Sun."
-msgstr ""
+msgstr "Dom."
 
 #: templates/lAfix.php:10
 msgid "Mon."
-msgstr ""
+msgstr "Lun."
 
 #: templates/lAfix.php:11
 msgid "Tue."
-msgstr ""
+msgstr "Mar."
 
 #: templates/lAfix.php:12
 msgid "Wed."
-msgstr ""
+msgstr "Mer."
 
 #: templates/lAfix.php:13
 msgid "Thu."
-msgstr ""
+msgstr "Gio."
 
 #: templates/lAfix.php:14
 msgid "Fri."
-msgstr ""
+msgstr "Ven."
 
 #: templates/lAfix.php:15
 msgid "Sat."
-msgstr ""
+msgstr "Sab."
 
 #: templates/lAfix.php:28
 msgid "Jan."
-msgstr ""
+msgstr "Gen."
 
 #: templates/lAfix.php:29
 msgid "Feb."
-msgstr ""
+msgstr "Feb."
 
 #: templates/lAfix.php:30
 msgid "Mar."
-msgstr ""
+msgstr "Mar."
 
 #: templates/lAfix.php:31
 msgid "Apr."
-msgstr ""
+msgstr "Apr."
 
 #: templates/lAfix.php:32
 msgid "May."
-msgstr ""
+msgstr "Mag."
 
 #: templates/lAfix.php:33
 msgid "Jun."
-msgstr ""
+msgstr "Giu."
 
 #: templates/lAfix.php:34
 msgid "Jul."
-msgstr ""
+msgstr "Lug."
 
 #: templates/lAfix.php:35
 msgid "Aug."
-msgstr ""
+msgstr "Ago."
 
 #: templates/lAfix.php:36
 msgid "Sep."
-msgstr ""
+msgstr "Set."
 
 #: templates/lAfix.php:37
 msgid "Oct."
-msgstr ""
+msgstr "Ott."
 
 #: templates/lAfix.php:38
 msgid "Nov."
-msgstr ""
+msgstr "Nov."
 
 #: templates/lAfix.php:39
 msgid "Dec."
-msgstr ""
+msgstr "Dic."
 
 #: templates/part.choosecalendar.php:1
 msgid "Choose active calendars"
@@ -521,7 +522,7 @@ msgstr "Ripeti"
 
 #: templates/part.eventform.php:68
 msgid "Advanced"
-msgstr ""
+msgstr "Avanzato"
 
 #: templates/part.eventform.php:112
 msgid "Select weekdays"
@@ -533,11 +534,11 @@ msgstr "Seleziona i giorni"
 
 #: templates/part.eventform.php:130
 msgid "and the events day of year."
-msgstr ""
+msgstr "e il giorno dell'anno degli eventi"
 
 #: templates/part.eventform.php:143
 msgid "and the events day of month."
-msgstr ""
+msgstr "e il giorno del mese degli eventi"
 
 #: templates/part.eventform.php:151
 msgid "Select months"
@@ -549,7 +550,7 @@ msgstr "Seleziona le settimane"
 
 #: templates/part.eventform.php:169
 msgid "and the events week of year."
-msgstr ""
+msgstr "e la settimana dell'anno degli eventi"
 
 #: templates/part.eventform.php:175
 msgid "Interval"
@@ -561,7 +562,7 @@ msgstr "Fine"
 
 #: templates/part.eventform.php:193
 msgid "occurrences"
-msgstr ""
+msgstr "occorrenze"
 
 #: templates/part.eventform.php:208
 msgid "Location"
@@ -581,7 +582,7 @@ msgstr "Descrizione evento"
 
 #: templates/part.import.php:1
 msgid "Import a calendar file"
-msgstr ""
+msgstr "Importa un file calendario"
 
 #: templates/part.import.php:6
 msgid "Please choose the calendar"
@@ -589,11 +590,11 @@ msgstr "Per favore scegli il calendario"
 
 #: templates/part.import.php:10
 msgid "create a new calendar"
-msgstr ""
+msgstr "Crea un nuovo calendario"
 
 #: templates/part.import.php:15
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Nome del nuovo calendario"
 
 #: templates/part.import.php:17
 msgid "Import"
@@ -601,15 +602,15 @@ msgstr "Importa"
 
 #: templates/part.import.php:20
 msgid "Importing calendar"
-msgstr ""
+msgstr "Sto importando il calendario"
 
 #: templates/part.import.php:23
 msgid "Calendar imported successfully"
-msgstr ""
+msgstr "Calendario importato con successo"
 
 #: templates/part.import.php:24
 msgid "Close Dialog"
-msgstr ""
+msgstr "Chiudi la finestra di dialogo"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index cee00f2bbdc..7eee067d6eb 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <formalist@email.it>, 2012.
 # Francesco Apruzzese <cescoap@gmail.com>, 2011.
 #   <marco@carnazzo.it>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 17:11+0000\n"
+"Last-Translator: formalist <formalist@email.it>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,47 +22,47 @@ msgstr ""
 
 #: ajax/activation.php:17 ajax/updateaddressbook.php:26
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "Errore nel (dis)attivare la rubrica"
 
 #: ajax/addcard.php:79
 msgid "There was an error adding the contact."
-msgstr ""
+msgstr "Si è verificato un errore nell'aggiunta del contatto."
 
 #: ajax/addproperty.php:39
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "Impossibile aggiungere una proprietà vuota."
 
 #: ajax/addproperty.php:51
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "Deve essere riempito almeno un indirizzo ."
 
 #: ajax/addproperty.php:77
 msgid "Error adding contact property."
-msgstr ""
+msgstr "Errore durante l'aggiunta della proprietà del contatto."
 
 #: ajax/createaddressbook.php:20
 msgid "Error adding addressbook."
-msgstr ""
+msgstr "Errore nell'aggiunta della rubrica."
 
 #: ajax/createaddressbook.php:26
 msgid "Error activating addressbook."
-msgstr ""
+msgstr "Errore nell'attivazione della rubrica."
 
 #: ajax/deleteproperty.php:40
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Errore nella cancellazione della proprietà del contatto."
 
 #: ajax/setproperty.php:79
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Errore nell'aggiornamento della proprietà del contatto."
 
 #: ajax/updateaddressbook.php:20
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Errore nell'aggiornamento della rubrica."
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "Contatti"
 
 #: lib/app.php:42
 msgid "This is not your addressbook."
@@ -128,7 +129,7 @@ msgstr "Cercapersone"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Contatto"
 
 #: photo.php:40
 msgid "This is not your contact."
@@ -148,11 +149,11 @@ msgstr "Aggiungi contatto"
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "Rubriche"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "Rubrica"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
@@ -230,7 +231,7 @@ msgstr "Cancella"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "Scarica contatto"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
@@ -242,11 +243,11 @@ msgstr "Aggiungi"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Nuova Rubrica"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Modifica Rubrica"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
@@ -286,6 +287,6 @@ msgstr "Aggiorna"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
-msgstr ""
+msgstr "Indirizzo di sincronizzazione CarDAV:"
 
 
diff --git a/l10n/it/core.po b/l10n/it/core.po
index addabc52510..1546b2da31c 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -4,16 +4,16 @@
 # 
 # Translators:
 #   <cosenal@gmail.com>, 2011.
-# Francesco Apruzzese <cescoap@gmail.com>, 2011.
+# Francesco Apruzzese <cescoap@gmail.com>, 2011, 2012.
 #   <marco@carnazzo.it>, 2011, 2012.
 #   <rb.colombo@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-12 20:51+0000\n"
-"Last-Translator: ufic <marco@carnazzo.it>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 08:55+0000\n"
+"Last-Translator: Francesco Apruzzese <cescoap@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,7 +56,7 @@ msgstr "La password è stata reimpostata"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr "Alla pagina di ingresso"
+msgstr "Alla pagina di login"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -133,15 +133,15 @@ msgstr "Host del database"
 
 #: templates/installation.php:98
 msgid "Finish setup"
-msgstr "Termina"
+msgstr "Termina Configurazione"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr "Servizi web nelle tue mani"
+msgstr "servizi web nelle tue mani"
 
 #: templates/layout.user.php:34
 msgid "Log out"
-msgstr "Log out"
+msgstr "Esci"
 
 #: templates/layout.user.php:46 templates/layout.user.php:47
 msgid "Settings"
@@ -149,7 +149,7 @@ msgstr "Impostazioni"
 
 #: templates/login.php:5
 msgid "Lost your password?"
-msgstr "Password persa?"
+msgstr "Hai perso la password?"
 
 #: templates/login.php:15
 msgid "remember"
diff --git a/l10n/it/gallery.po b/l10n/it/gallery.po
index 4dffa1257dc..1e65c8e50ed 100644
--- a/l10n/it/gallery.po
+++ b/l10n/it/gallery.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <formalist@email.it>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 17:13+0000\n"
+"Last-Translator: formalist <formalist@email.it>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr ""
+msgstr "Galleria"
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Rileggi"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Indietro"
 
 
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 6f2cf988163..f4bcbf38d4e 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -3,7 +3,9 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <formalist@email.it>, 2012.
 # Francesco Apruzzese <cescoap@gmail.com>, 2011.
+#   <icewind1991@gmail.com>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 #   <marco@carnazzo.it>, 2011, 2012.
 #   <rb.colombo@gmail.com>, 2011.
@@ -11,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-12 20:56+0000\n"
-"Last-Translator: ufic <marco@carnazzo.it>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,6 +39,10 @@ msgstr "OpenID Modificato"
 msgid "Language changed"
 msgstr "Lingua modificata"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Livello di log"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 24ad0f09c5d..6b3cde7791c 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/team/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -33,6 +33,10 @@ msgstr "OpenIDが変更されました"
 msgid "Language changed"
 msgstr "言語が変更されました"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index ae3884d073b..98eb2381dd2 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://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/team/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID huet geännert"
 msgid "Language changed"
 msgstr "Sprooch huet geännert"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index ec0f1bd45cb..066f574751c 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://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/team/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID pakeistas"
 msgid "Language changed"
 msgstr "Kalba pakeista"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index d8166d0823a..4d30c8454be 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/team/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID ditukar"
 msgid "Language changed"
 msgstr "Bahasa ditukar"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 70ffa14920e..e0b31f5828b 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/team/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID endret"
 msgid "Language changed"
 msgstr "Språk endret"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index eacedbd0379..a52b7a06484 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-12 18:13+0000\n"
-"Last-Translator: Pietje8501 <pietje8501@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,6 +37,10 @@ msgstr "OpenID is aangepast"
 msgid "Language changed"
 msgstr "Taal aangepast"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Logniveau"
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 7e87bd41237..ea0de894d5a 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/team/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID endra"
 msgid "Language changed"
 msgstr "Språk endra"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 1fa60a77fd9..22ec18316b8 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-11 13:11+0000\n"
-"Last-Translator: Marcin Małecki <gerber@tkdami.net>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,6 +37,10 @@ msgstr "Zmieniono OpenID"
 msgid "Language changed"
 msgstr "Język zmieniony"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Poziom logowania"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index ab2a8825dd0..047d0f21e5e 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/owncloud/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -35,6 +35,10 @@ msgstr "Mudou OpenID"
 msgid "Language changed"
 msgstr "Mudou Idioma"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 5b55ea33a78..e9a2cc34a36 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/team/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -33,6 +33,10 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index b6151572e85..8e54463bb00 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-12 13:22+0000\n"
-"Last-Translator: Claudiu <claudiu@tanaselia.ro>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/team/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,6 +34,10 @@ msgstr "OpenID schimbat"
 msgid "Language changed"
 msgstr "Limba a fost schimbată"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr "Nivel log-uri"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 54ecbef38e2..802e2953a87 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID был изменён"
 msgid "Language changed"
 msgstr "Язык изменён"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 51034c15311..c71317d6089 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <intense.feel@gmail.com>, 2011.
+#   <intense.feel@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 15:49+0000\n"
+"Last-Translator: intense <intense.feel@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Obnova Owncloud hesla"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -53,7 +53,7 @@ msgstr "Vaše heslo bolo obnovené"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Na prihlasovaciu stránku"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -134,7 +134,7 @@ msgstr "Dokončiť inštaláciu"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "webové služby pod vašou kontrolou"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -154,7 +154,7 @@ msgstr "zapamätať"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Prihlásiť sa"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/sk_SK/gallery.po b/l10n/sk_SK/gallery.po
index ec1dd850cd0..25fdcd74040 100644
--- a/l10n/sk_SK/gallery.po
+++ b/l10n/sk_SK/gallery.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <intense.feel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 15:07+0000\n"
+"Last-Translator: intense <intense.feel@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr ""
+msgstr "Galéria"
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Znovu oskenovať"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Späť"
 
 
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 17dd38a23ba..358e67ce2f2 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <intense.feel@gmail.com>, 2011.
+#   <intense.feel@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/team/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "email Changed"
-msgstr ""
+msgstr "email Zmenený"
 
 #: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
 msgid "Invalid request"
@@ -34,9 +34,13 @@ msgstr "OpenID zmenené"
 msgid "Language changed"
 msgstr "Jazyk zmenený"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
-msgstr ""
+msgstr "Úroveň záznamov"
 
 #: templates/apps.php:8
 msgid "Add your application"
@@ -104,15 +108,15 @@ msgstr "Zmeniť heslo"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "Vaša emailová adresa"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Vyplňte emailovú adresu pre aktivovanie obnovy hesla"
 
 #: templates/personal.php:32 templates/personal.php:33
 msgid "Language"
@@ -120,7 +124,7 @@ msgstr "Jazyk"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr "Pomôcť s prekladom"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -144,7 +148,7 @@ msgstr "Vytvoriť"
 
 #: templates/users.php:33
 msgid "Quota"
-msgstr ""
+msgstr "Kvóta"
 
 #: templates/users.php:58
 msgid "Delete"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 13af55c4a9a..011b0cbd9ff 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/team/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID spremenjen"
 msgid "Language changed"
 msgstr "Jezik je bil spremenjen"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index 5ea7d2b6d3f..e0ba581a210 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Slobodan Terzić <githzerai06@gmail.com>, 2011.
+# Slobodan Terzić <githzerai06@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:45+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 01:59+0000\n"
+"Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,7 +60,7 @@ msgstr ""
 
 #: appinfo/app.php:21 templates/settings.php:3
 msgid "Contacts"
-msgstr ""
+msgstr "Контакти"
 
 #: lib/app.php:42
 msgid "This is not your addressbook."
@@ -127,7 +127,7 @@ msgstr "Пејџер"
 
 #: lib/search.php:22
 msgid "Contact"
-msgstr ""
+msgstr "Контакт"
 
 #: photo.php:40
 msgid "This is not your contact."
@@ -147,11 +147,11 @@ msgstr "Додај контакт"
 
 #: templates/index.php:7
 msgid "Addressbooks"
-msgstr ""
+msgstr "Адресар"
 
 #: templates/part.addcardform.php:8
 msgid "Addressbook"
-msgstr ""
+msgstr "Адресар"
 
 #: templates/part.addcardform.php:21
 msgid "Name"
@@ -161,7 +161,7 @@ msgstr "Име"
 #: templates/part.details.php:79 templates/part.setpropertyform.php:10
 #: templates/part.setpropertyform.php:47
 msgid "Type"
-msgstr ""
+msgstr "Тип"
 
 #: templates/part.addcardform.php:65 templates/part.details.php:49
 #: templates/part.setpropertyform.php:16
@@ -204,11 +204,11 @@ msgstr "Направи контакт"
 
 #: templates/part.chooseaddressbook.php:1
 msgid "Choose active Address Books"
-msgstr ""
+msgstr "Изаберите активне адресаре"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
-msgstr ""
+msgstr "Нови адресар"
 
 #: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:5
@@ -217,7 +217,7 @@ msgstr ""
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Download"
-msgstr ""
+msgstr "Преузимање"
 
 #: templates/part.chooseaddressbook.rowfields.php:5
 msgid "Edit"
@@ -229,43 +229,43 @@ msgstr "Обриши"
 
 #: templates/part.details.php:3
 msgid "Download contact"
-msgstr ""
+msgstr "Преузми контакт"
 
 #: templates/part.details.php:4
 msgid "Delete contact"
-msgstr ""
+msgstr "Обриши контакт"
 
 #: templates/part.details.php:34
 msgid "Add"
-msgstr ""
+msgstr "Додај"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
-msgstr ""
+msgstr "Нови адресар"
 
 #: templates/part.editaddressbook.php:9
 msgid "Edit Addressbook"
-msgstr ""
+msgstr "Уреди адресар"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Приказано име"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Активан"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
-msgstr ""
+msgstr "Сними"
 
 #: templates/part.editaddressbook.php:29
 msgid "Submit"
-msgstr ""
+msgstr "Пошаљи"
 
 #: templates/part.editaddressbook.php:30
 msgid "Cancel"
-msgstr ""
+msgstr "Откажи"
 
 #: templates/part.property.php:3
 msgid "Birthday"
@@ -273,7 +273,7 @@ msgstr "Рођендан"
 
 #: templates/part.property.php:23
 msgid "Preferred"
-msgstr ""
+msgstr "Пожељан"
 
 #: templates/part.property.php:23 templates/part.setpropertyform.php:45
 msgid "Phone"
@@ -281,7 +281,7 @@ msgstr "Телефон"
 
 #: templates/part.setpropertyform.php:57
 msgid "Update"
-msgstr ""
+msgstr "Ажурирај"
 
 #: templates/settings.php:4
 msgid "CardDAV syncing address:"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 9bf02eedf6e..fa3a4996d57 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Slobodan Terzić <githzerai06@gmail.com>, 2011.
+# Slobodan Terzić <githzerai06@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 02:01+0000\n"
+"Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: lostpassword/index.php:24
 msgid "Owncloud password reset"
-msgstr ""
+msgstr "Ресетовање лозинке за Оунклауд"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Овом везом ресетујте своју лозинку: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
@@ -53,7 +53,7 @@ msgstr "Ваша лозинка је ресетована"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "На страницу за пријаву"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -134,7 +134,7 @@ msgstr "Заврши подешавање"
 
 #: templates/layout.guest.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "веб сервиси под контролом"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -154,7 +154,7 @@ msgstr "упамти"
 
 #: templates/login.php:16
 msgid "Log in"
-msgstr ""
+msgstr "Пријава"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 9dc152c94aa..807dfc57678 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Slobodan Terzić <githzerai06@gmail.com>, 2011.
+# Slobodan Terzić <githzerai06@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 02:03+0000\n"
+"Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,19 +56,19 @@ msgstr "Максимална величина пошиљке"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Нови"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "текстуални фајл"
 
 #: templates/index.php:11
 msgid "Folder"
-msgstr ""
+msgstr "фасцикла"
 
 #: templates/index.php:12
 msgid "From the web"
-msgstr ""
+msgstr "са веба"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/sr/gallery.po b/l10n/sr/gallery.po
index 01a1cbaae8c..b30e34c7237 100644
--- a/l10n/sr/gallery.po
+++ b/l10n/sr/gallery.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Slobodan Terzić <githzerai06@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 01:56+0000\n"
+"Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr ""
+msgstr "Галерија"
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "Претражи поново"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "Назад"
 
 
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index dd68b115b43..123642508b3 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Slobodan Terzić <githzerai06@gmail.com>, 2011.
+# Slobodan Terzić <githzerai06@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/team/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID је измењен"
 msgid "Language changed"
 msgstr "Језик је измењен"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
@@ -104,11 +108,11 @@ msgstr "Измени лозинку"
 
 #: templates/personal.php:24
 msgid "Email"
-msgstr ""
+msgstr "Е-пошта"
 
 #: templates/personal.php:25
 msgid "Your email address"
-msgstr ""
+msgstr "Ваша адреса е-поште"
 
 #: templates/personal.php:26
 msgid "Fill in an email address to enable password recovery"
@@ -120,7 +124,7 @@ msgstr "Језик"
 
 #: templates/personal.php:38
 msgid "Help translate"
-msgstr ""
+msgstr " Помозите у превођењу"
 
 #: templates/personal.php:45
 msgid "use this address to connect to your ownCloud in your file manager"
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index d70e5ea94a6..439bcd298a7 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://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/team/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID je izmenjen"
 msgid "Language changed"
 msgstr "Jezik je izmenjen"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 95b886d8c72..f123e1a317d 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/team/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -35,6 +35,10 @@ msgstr "OpenID ändrat"
 msgid "Language changed"
 msgstr "Språk ändrades"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 2ccfc8c0f92..aeb0607e4a9 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-01-15 14:44+0100\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index f2d99d896d9..3a63204b84c 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-01-15 14:44+0100\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\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/core.pot b/l10n/templates/core.pot
index 16f328aea2a..61eafa21548 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-01-15 14:44+0100\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\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.pot b/l10n/templates/files.pot
index d5f6e43db87..097e5749953 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-01-15 14:44+0100\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 255295569da..3f50792c81b 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-01-15 14:44+0100\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\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 e1a750f3b6e..9693dc4eee9 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-01-15 14:44+0100\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\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 0142d2a8378..8c896ec83e7 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-01-15 14:44+0100\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\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,6 +33,10 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 58aefca15f5..8763b746c4d 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/team/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID Değiştirildi"
 msgid "Language changed"
 msgstr "Dil değiştirildi"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/l10n/zh_CN/gallery.po b/l10n/zh_CN/gallery.po
index e3e2d897cd0..d791cd35906 100644
--- a/l10n/zh_CN/gallery.po
+++ b/l10n/zh_CN/gallery.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Bartek  <bart.p.pl@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-15 14:44+0100\n"
-"PO-Revision-Date: 2012-01-15 13:48+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2012-01-15 15:26+0100\n"
+"PO-Revision-Date: 2012-01-15 21:45+0000\n"
+"Last-Translator: Bartek <bart.p.pl@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: appinfo/app.php:41
 msgid "Gallery"
-msgstr ""
+msgstr "画廊"
 
 #: templates/index.php:10
 msgid "Rescan"
-msgstr ""
+msgstr "重新扫描"
 
 #: templates/view_album.php:19
 msgid "Back"
-msgstr ""
+msgstr "返回"
 
 
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 7a6daf187ec..126f0973d0e 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-11 00:19+0100\n"
-"PO-Revision-Date: 2012-01-10 23:43+0000\n"
+"POT-Creation-Date: 2012-01-16 17:31+0100\n"
+"PO-Revision-Date: 2012-01-16 16:32+0000\n"
 "Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr "OpenID 已修改"
 msgid "Language changed"
 msgstr "语言已修改"
 
+#: personal.php:36 personal.php:37
+msgid "__language_name__"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Log level"
 msgstr ""
diff --git a/lib/base.php b/lib/base.php
index 9531f7ed74f..ab7cb2990ed 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -156,7 +156,11 @@ class OC{
 			$installedVersion=OC_Config::getValue('version','0.0.0');
 			$currentVersion=implode('.',OC_Util::getVersion());
 			if (version_compare($currentVersion, $installedVersion, '>')) {
-				OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/db_structure.xml');
+				$result=OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/db_structure.xml');
+				if(!$result){
+					echo 'Error while upgrading the database';
+					die();
+				}
 				OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
 			}
 
diff --git a/lib/db.php b/lib/db.php
index f6eddf7825c..4860651b323 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -144,7 +144,7 @@ class OC_DB {
 
 			// Prepare options array
 			$options = array(
-			  'portability' => MDB2_PORTABILITY_ALL,
+			  'portability' => MDB2_PORTABILITY_ALL & (!MDB2_PORTABILITY_FIX_CASE),
 			  'log_line_break' => '<br>',
 			  'idxname_format' => '%s',
 			  'debug' => true,
@@ -361,6 +361,11 @@ class OC_DB {
 		$content = file_get_contents( $file );
 		
 		$previousSchema = self::$schema->getDefinitionFromDatabase();
+		if (PEAR::isError($previousSchema)) {
+			$error = $previousSchema->getMessage();
+			OC_Log::write('core','Failed to get existing database structure for upgrading ('.$error.')',OC_Log::FATAL);
+			return false;
+		}
 
 		// Make changes and save them to a temporary file
 		$file2 = tempnam( get_temp_dir(), 'oc_db_scheme_' );
@@ -376,9 +381,9 @@ class OC_DB {
 		unlink( $file2 );
 		
 		if (PEAR::isError($op)) {
-		    $error = $op->getMessage();
-		    OC_Log::write('core','Failed to update database structure ('.$error.')',OC_Log::FATAL);
-		    return false;
+			$error = $op->getMessage();
+			OC_Log::write('core','Failed to update database structure ('.$error.')',OC_Log::FATAL);
+			return false;
 		}
 		return true;
 	}
diff --git a/lib/util.php b/lib/util.php
index 009119b54a9..09513d32328 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -226,6 +226,10 @@ class OC_Util {
 			$errors[]=array('error'=>'PHP module ctype is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
 		}
 
+		if(file_exists(OC::$SERVERROOT."/config/config.php") and !is_writeable(OC::$SERVERROOT."/config/config.php")){
+			$errors[]=array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver use write access to the config directory in owncloud");
+		}
+
 		return $errors;
 	}
 
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
new file mode 100644
index 00000000000..43fbc22085b
--- /dev/null
+++ b/settings/l10n/gl.php
@@ -0,0 +1,35 @@
+<?php $TRANSLATIONS = array(
+"email Changed" => "Correo electrónico mudado",
+"Invalid request" => "Petición non correcta",
+"OpenID Changed" => "Mudou o OpenID",
+"Language changed" => "O idioma mudou",
+"Log level" => "Nivel de rexistro",
+"Add your application" => "Engada o seu aplicativo",
+"Select an App" => "Escolla un Aplicativo",
+"-licensed" => "-autorizado",
+"by" => "por",
+"Ask a question" => "Pregunte",
+"Problems connecting to help database." => "Problemas conectando coa base de datos de axuda",
+"Go there manually." => "Ir manualmente",
+"Answer" => "Resposta",
+"You use" => "Vostede usa",
+"of the available" => "dun total de",
+"Your password got changed" => "O seu contrasinal mudou",
+"Unable to change your password" => "Incapaz de trocar o seu contrasinal",
+"Current password" => "Contrasinal actual",
+"New password" => "Novo contrasinal",
+"show" => "amosar",
+"Change password" => "Mudar contrasinal",
+"Email" => "Correo electrónico",
+"Your email address" => "A súa dirección de correo electrónico",
+"Fill in an email address to enable password recovery" => "Escriba unha dirección de correo electrónico para habilitar a recuperación do contrasinal",
+"Language" => "Idioma",
+"Help translate" => "Axude na tradución",
+"use this address to connect to your ownCloud in your file manager" => "utilice esta dirección para conectar o teu ownCloud no xestor de ficheiros",
+"Name" => "Nome",
+"Password" => "Contrasinal",
+"Groups" => "Grupos",
+"Create" => "Crear",
+"Quota" => "Quota",
+"Delete" => "Borrar"
+);
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 08424ab24c8..502247d34f8 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,7 +1,9 @@
 <?php $TRANSLATIONS = array(
+"email Changed" => "email Zmenený",
 "Invalid request" => "Neplatná požiadavka",
 "OpenID Changed" => "OpenID zmenené",
 "Language changed" => "Jazyk zmenený",
+"Log level" => "Úroveň záznamov",
 "Add your application" => "Pridajte svoju aplikáciu",
 "Select an App" => "Vyberte Aplikáciu",
 "-licensed" => "-licencované",
@@ -18,11 +20,16 @@
 "New password" => "Nové heslo",
 "show" => "zobraziť",
 "Change password" => "Zmeniť heslo",
+"Email" => "Email",
+"Your email address" => "Vaša emailová adresa",
+"Fill in an email address to enable password recovery" => "Vyplňte emailovú adresu pre aktivovanie obnovy hesla",
 "Language" => "Jazyk",
+"Help translate" => "Pomôcť s prekladom",
 "use this address to connect to your ownCloud in your file manager" => "použite túto adresu pre spojenie s vaším ownCloud v správcovi súborov",
 "Name" => "Meno",
 "Password" => "Heslo",
 "Groups" => "Skupiny",
 "Create" => "Vytvoriť",
+"Quota" => "Kvóta",
 "Delete" => "Odstrániť"
 );
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index ea61815a619..6612b314c67 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -18,7 +18,10 @@
 "New password" => "Нова лозинка",
 "show" => "прикажи",
 "Change password" => "Измени лозинку",
+"Email" => "Е-пошта",
+"Your email address" => "Ваша адреса е-поште",
 "Language" => "Језик",
+"Help translate" => " Помозите у превођењу",
 "use this address to connect to your ownCloud in your file manager" => "користите ову адресу да би се повезали на ownCloud путем менаџњера фајлова",
 "Name" => "Име",
 "Password" => "Лозинка",