diff --git a/.tx/config b/.tx/config
index e409d1a4495c39117677a47eac5151fcec90f585..233dae8eb3ced4529b117124512648bf60934994 100644
--- a/.tx/config
+++ b/.tx/config
@@ -13,7 +13,6 @@ trans.da = l10n/da/core.po
 trans.de = l10n/de/core.po
 trans.el = l10n/el/core.po
 trans.es = l10n/es/core.po
-trans.et_EE = l10n/l10n/et_EE/core.po
 trans.fr = l10n/fr/core.po
 trans.id = l10n/id/core.po
 trans.it = l10n/it/core.po
@@ -24,8 +23,6 @@ trans.pl = l10n/pl/core.po
 trans.pt_BR = l10n/pt_BR/core.po
 trans.ro = l10n/ro/core.po
 trans.ru = l10n/ru/core.po
-trans.sr = l10n/sr/core.po
-trans.sr@latin = l10n/sr@latin/core.po
 trans.sv = l10n/sv/core.po
 trans.zh_CN = l10n/zh_CN/core.po
 
@@ -41,7 +38,6 @@ trans.da = l10n/da/settings.po
 trans.de = l10n/de/settings.po
 trans.el = l10n/el/settings.po
 trans.es = l10n/es/settings.po
-trans.et_EE = l10n/l10n/et_EE/settings.po
 trans.fr = l10n/fr/settings.po
 trans.id = l10n/id/settings.po
 trans.it = l10n/it/settings.po
@@ -52,8 +48,6 @@ trans.pl = l10n/pl/settings.po
 trans.pt_BR = l10n/pt_BR/settings.po
 trans.ro = l10n/ro/settings.po
 trans.ru = l10n/ru/settings.po
-trans.sr = l10n/sr/settings.po
-trans.sr@latin = l10n/sr@latin/settings.po
 trans.sv = l10n/sv/settings.po
 trans.zh_CN = l10n/zh_CN/settings.po
 
@@ -69,7 +63,6 @@ trans.da = l10n/da/files.po
 trans.de = l10n/de/files.po
 trans.el = l10n/el/files.po
 trans.es = l10n/es/files.po
-trans.et_EE = l10n/l10n/et_EE/files.po
 trans.fr = l10n/fr/files.po
 trans.id = l10n/id/files.po
 trans.it = l10n/it/files.po
@@ -80,8 +73,6 @@ trans.pl = l10n/pl/files.po
 trans.pt_BR = l10n/pt_BR/files.po
 trans.ro = l10n/ro/files.po
 trans.ru = l10n/ru/files.po
-trans.sr = l10n/sr/files.po
-trans.sr@latin = l10n/sr@latin/files.po
 trans.sv = l10n/sv/files.po
 trans.zh_CN = l10n/zh_CN/files.po
 
@@ -97,7 +88,6 @@ trans.da = l10n/da/media.po
 trans.de = l10n/de/media.po
 trans.el = l10n/el/media.po
 trans.es = l10n/es/media.po
-trans.et_EE = l10n/l10n/et_EE/media.po
 trans.fr = l10n/fr/media.po
 trans.id = l10n/id/media.po
 trans.it = l10n/it/media.po
@@ -108,8 +98,6 @@ trans.pl = l10n/pl/media.po
 trans.pt_BR = l10n/pt_BR/media.po
 trans.ro = l10n/ro/media.po
 trans.ru = l10n/ru/media.po
-trans.sr = l10n/sr/media.po
-trans.sr@latin = l10n/sr@latin/media.po
 trans.sv = l10n/sv/media.po
 trans.zh_CN = l10n/zh_CN/media.po
 
diff --git a/README b/README
index 18b817ad3461095db27b44df9683b28a5a7ef2af..4ad4f82f304ad77bc4e9c5813b51d0d653d3ef9a 100644
--- a/README
+++ b/README
@@ -1,12 +1,13 @@
-ownCloud is a personal cloud which runs on your own server.
+ownCloud gives you freedom and control over your own data.
+A personal cloud which runs on your own server.
 It is alpha software in development and should be treated accordingly.
 
-http://owncloud.org
+http://ownCloud.org
 
 Installation instructions: http://owncloud.org/index.php/Installation
-Source code: http://projects.kde.org/owncloud
+Source code: http://gitorious.org/owncloud
 
-Mailing list: https://mail.kde.org/mailman/listinfo/owncloud
-IRC channel: http://webchat.freenode.net/?channels=#owncloud
+Mailing list: http://mail.kde.org/mailman/listinfo/owncloud
+IRC channel: http://webchat.freenode.net/?channels=owncloud
 Diaspora: https://joindiaspora.com/u/owncloud
 Identi.ca: http://identi.ca/owncloud
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 5c21a028017e0511a71c0e9a3709871c61955c74..c736d122294c974588d00bf802b7f8d051d7e53d 100644
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -33,8 +33,8 @@ $weekdays = array('monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'satur
 				var oc_cal_dayshort = new Array("<?php echo $l -> t("Sun.");?>", "<?php echo $l -> t("Mon.");?>", "<?php echo $l -> t("Tue.");?>", "<?php echo $l -> t("Wed.");?>", "<?php echo $l -> t("Thu.");?>", "<?php echo $l -> t("Fri.");?>", "<?php echo $l -> t("Sat.");?>");
 				var oc_cal_monthlong = new Array("<?php echo $l -> t("January");?>", "<?php echo $l -> t("February");?>", "<?php echo $l -> t("March");?>", "<?php echo $l -> t("April");?>", "<?php echo $l -> t("May");?>", "<?php echo $l -> t("June");?>", "<?php echo $l -> t("July");?>", "<?php echo $l -> t("August");?>", "<?php echo $l -> t("September");?>", "<?php echo $l -> t("October");?>", "<?php echo $l -> t("November");?>", "<?php echo $l -> t("December");?>");
 				var oc_cal_monthshort = new Array("<?php echo $l -> t("Jan.");?>", "<?php echo $l -> t("Feb.");?>", "<?php echo $l -> t("Mar.");?>", "<?php echo $l -> t("Apr.");?>", "<?php echo $l -> t("May");?>", "<?php echo $l -> t("Jun.");?>", "<?php echo $l -> t("Jul.");?>", "<?php echo $l -> t("Aug.");?>", "<?php echo $l -> t("Sep.");?>", "<?php echo $l -> t("Oct.");?>", "<?php echo $l -> t("Nov.");?>", "<?php echo $l -> t("Dec.");?>");
-				var cw_label = "<?php echo $l->t("CW");?>";
-				var cws_label = "<?php echo $l->t("CWs");?>";
+				var cw_label = "<?php echo $l->t("Week");?>";
+				var cws_label = "<?php echo $l->t("Weeks");?>";
 				</script>
 				<div id="sysbox"></div>
 				<div id="controls">
diff --git a/core/css/styles.css b/core/css/styles.css
index a3326c0082611a2027ec376746637a73d17189e6..30ac4c3282eec1c4cf674a888118fc3e0d65add5 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -68,7 +68,7 @@ input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-
 #login form fieldset { background:0; border:0; margin-bottom:2em; padding:0; }
 #login form fieldset legend { font-weight:bold; }
 #login form label { position:absolute; margin:.8em .8em; font-size:1.5em; color:#666; }
-#login #dbhostlabel, #login #dbtableprefixlabel, #login #directorylabel { display:block; margin:.95em 0 .8em -7em; }
+#login #dbhostlabel, #login #directorylabel { display:block; margin:.95em 0 .8em -7em; }
 #login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; }
 #login form ul.errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 4em 0; padding:1em 1em 1em 5em; }
 
diff --git a/core/js/setup.js b/core/js/setup.js
index 736bedac755477dce7d53c56a3d499baa9b8e6ee..01b8c1303970a93e15d8b3923dfae1a93818423f 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -2,20 +2,28 @@ $(document).ready(function() {
 	$('#selectDbType').buttonset();
 	$('#datadirField').hide(250);
 	if($('#hasSQLite').val()=='true'){
-		$('#databaseField').hide(250);
-		$('#use_other_db').slideUp(250);
+		$('#databaseField').hide();
+		$('#use_other_db').slideUp();
+		$('#dbhost').hide(250);
+		$('#dbhostlabel').hide(250);
 	}
 
 	$('#sqlite').click(function() {
 		$('#use_other_db').slideUp(250);
+		$('#dbhost').hide(250);
+		$('#dbhostlabel').hide(250);
 	});
 
 	$('#mysql').click(function() {
 		$('#use_other_db').slideDown(250);
+		$('#dbhost').show(250);
+		$('#dbhostlabel').show(250);
 	});
 	
 	$('#pgsql').click(function() {
 		$('#use_other_db').slideDown(250);
+		$('#dbhost').show(250);
+		$('#dbhostlabel').show(250);
 	});
 
 	$('#showAdvanced').click(function() {
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 1067415e1dc96bf7f145d5c9000cfd4782645a75..163510bdaff6794f7bd74e9e93719e9d122de1fa 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -2,7 +2,6 @@
 "Cloud not found" => "обклакът не намерен",
 "Database name" => "Име на базата",
 "Advanced" => "Разширено",
-"Table prefix" => "Префикс за таблиците",
 "Data folder" => "Директория за данни",
 "Finish setup" => "Завършване на настройките",
 "You are logged out." => "Вие излязохте.",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index f77f66c3ee6c3cd43bfd247de177583c67922649..d5020abbd559be7f647759e1f6ad71cfd72d8c86 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -14,15 +14,22 @@
 "Database password" => "Contrasenya de la base de dades",
 "Database name" => "Nom de la base de dades",
 "Advanced" => "Avançat",
-"Table prefix" => "Prefix de les taules",
+"Database host" => "Ordinador central de la base de dades",
 "Data folder" => "Carpeta de dades",
 "Finish setup" => "Acaba la configuració",
-"gives you the freedom to control your own data on the internet" => "us dóna la llibertat per controlar les vostres dades a internet",
+"gives you freedom and control over your own data" => "us dóna llibertat i control sobre les seves dades",
 "Log out" => "Sortir",
 "Settings" => "Arranjament",
+"Lost your password?" => "Heu perdut la contrasenya?",
 "remember" => "recorda'm",
 "You are logged out." => "Heu tancat la sessió.",
+"You will receive a link to reset your password via Email." => "Rebreu un enllaç per correu electrònic per restablir la contrasenya",
+"Requested" => "Sol·licitat",
 "Login failed!" => "L'inici de sessió ha fallat!",
+"Username or Email" => "Nom d'usuari o correu electrònic",
+"Request reset" => "Sol.licitud de restabliment",
 "prev" => "anterior",
-"next" => "següent"
+"next" => "següent",
+"New password" => "Nova contrasenya",
+"Reset password" => "Restabliment de la contrasenya"
 );
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 22ee9c36f5bf9b8255a408cb9fdf3497f2cf0363..08a90ba4a0fb138a6b5491bb6c1855606eba953c 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -14,10 +14,8 @@
 "Database password" => "Heslo k databázi",
 "Database name" => "Název databáze",
 "Advanced" => "Rozšířené volby",
-"Table prefix" => "Prefix tabulek",
 "Data folder" => "Datový adresář",
 "Finish setup" => "Dokončit instalaci",
-"gives you the freedom to control your own data on the internet" => "Vám dává svobodu práce s Vaše vlastními daty na internetu",
 "Log out" => "Odhlásit se",
 "Settings" => "Nastavení",
 "remember" => "zapamatovat si",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 2dd1a8ac61895cc9739291bf94cd9ba5be07f55a..5deaa15cdf53b218f2a95602ccbab199e8ade629 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -14,10 +14,8 @@
 "Database password" => "Database-kodeord",
 "Database name" => "Database-navn",
 "Advanced" => "Avanceret",
-"Table prefix" => "Tabel præfiks",
 "Data folder" => "Data mappe",
 "Finish setup" => "Afslut installation",
-"gives you the freedom to control your own data on the internet" => "giver dig friheden til at kontrollere dine egne data på internettet",
 "Log out" => "Log ud",
 "Settings" => "Indstillinger",
 "remember" => "husk",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 05c0360baae92e9bd04d00424e3f1006fdbde37d..0cdb99e0a64d7ed4bc58e92b070168f6540bf6f6 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -14,15 +14,22 @@
 "Database password" => "Datenbankpasswort",
 "Database name" => "Datenbankname",
 "Advanced" => "Erweitert",
-"Table prefix" => "Tabellenpräfix",
+"Database host" => "Datenbank-Host",
 "Data folder" => "Datenverzeichnis",
 "Finish setup" => "Installation abschließen",
-"gives you the freedom to control your own data on the internet" => "gibt dir die Freiheit, deine eigenen Daten im Internet zu kontrollieren.",
+"gives you freedom and control over your own data" => "gibt dir Freiheit und Kontrolle über deine eigenen Daten",
 "Log out" => "Abmelden",
 "Settings" => "Einstellungen",
+"Lost your password?" => "Passwort vergessen?",
 "remember" => "merken",
-"You are logged out." => "Erfolgreich abgemeldet.",
+"You are logged out." => "Abgemeldet",
+"You will receive a link to reset your password via Email." => "Du wirst eine Email erhalten.",
+"Requested" => "zurückgesetzt",
 "Login failed!" => "Anmeldung fehlgeschlagen!",
+"Username or Email" => "Nutzername oder Email",
+"Request reset" => "Zurücksetzen",
 "prev" => "Zurück",
-"next" => "Weiter"
+"next" => "Weiter",
+"New password" => "Neues Passwort",
+"Reset password" => "Zurücksetzen"
 );
diff --git a/core/l10n/el.php b/core/l10n/el.php
index dd7e1dcd38a75ae534128f74694cf95ad1879d03..91daff8a862442cddc2c9b3ac1cac4e2cdd5485d 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -14,10 +14,8 @@
 "Database password" => "Κωδικός πρόσβασης βάσης δεδομένων",
 "Database name" => "Όνομα βάσης δεδομένων",
 "Advanced" => "Για προχωρημένους",
-"Table prefix" => "Πρόθεμα πίνακα",
 "Data folder" => "Φάκελος δεδομένων",
 "Finish setup" => "Ολοκλήρωση εγκατάστασης",
-"gives you the freedom to control your own data on the internet" => "σας δίνει την ελευθερία να ελέγχετε τα δικά σας δεδομένα στο διαδίκτυο",
 "Log out" => "Αποσύνδεση",
 "Settings" => "Ρυθμίσεις",
 "remember" => "να με θυμάσαι",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index f0f37e166a3ba162b8cd993b46b38a155f9e6fc6..e58f0fa82162a1298335efbf2e9d967234cc036e 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -5,7 +5,7 @@
 "Admin" => "Administrador",
 "Help" => "Ayuda",
 "Cloud not found" => "No se encontró la nube",
-"Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
+"Create an <strong>admin account</strong>" => "Crea una <strong>cuenta de administrador</strong>",
 "Username" => "Nombre de usuario",
 "Password" => "Contraseña",
 "Configure the database" => "Configurar la base de datos",
@@ -14,15 +14,21 @@
 "Database password" => "Contraseña de la base de datos",
 "Database name" => "Nombre de la base de datos",
 "Advanced" => "Avanzado",
-"Table prefix" => "Prefijo de la tabla",
+"Database host" => "Host de la base de datos",
 "Data folder" => "Directorio de almacenamiento",
-"Finish setup" => "Completar instalación",
-"gives you the freedom to control your own data on the internet" => "te da la libertad del control de tus propios datos en internet",
+"Finish setup" => "Completar la instalación",
 "Log out" => "Salir",
 "Settings" => "Ajustes",
+"Lost your password?" => "¿Has perdido tu contraseña?",
 "remember" => "recuérdame",
 "You are logged out." => "Has cerrado sesión.",
+"You will receive a link to reset your password via Email." => "Recibirás un link para restablecer tu contraseña vía Email.",
+"Requested" => "Solicitado",
 "Login failed!" => "¡No se pudo iniciar sesión!",
+"Username or Email" => "Nombre de usuario o Email",
+"Request reset" => "Solicitar restablecimiento",
 "prev" => "anterior",
-"next" => "siguiente"
+"next" => "siguiente",
+"New password" => "Nueva contraseña",
+"Reset password" => "Restablecer contraseña"
 );
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 3abb79774dadd8a333d5e4da30b0dfbbafc50e37..3f668f786dc66b778ddd2af4d2bcc88113bfe677 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -14,15 +14,21 @@
 "Database password" => "Mot de passe de la base de données",
 "Database name" => "Nom de la base de données",
 "Advanced" => "Avancé",
-"Table prefix" => "Préfixe des tables",
+"Database host" => "Serveur de la base de données",
 "Data folder" => "Répertoire des données",
 "Finish setup" => "Terminer l'installation",
-"gives you the freedom to control your own data on the internet" => "vous rend libre de contrôler vos propres données sur internet",
 "Log out" => "Se déconnecter",
 "Settings" => "Paramètres",
+"Lost your password?" => "Mot de passe perdu ?",
 "remember" => "se souvenir de moi",
 "You are logged out." => "Vous êtes désormais déconnecté.",
+"You will receive a link to reset your password via Email." => "Vous allez recevoir un lien par email qui vous permettra de réinitialiser votre mot de passe.",
+"Requested" => "Nécessaire",
 "Login failed!" => "Échec de la connexion !",
+"Username or Email" => "Nom d'utilisateur ou Email",
+"Request reset" => "Demande de réinitialisation",
 "prev" => "précédent",
-"next" => "suivant"
+"next" => "suivant",
+"New password" => "Nouveau mot de passe",
+"Reset password" => "Réinitialisation du mot de passe"
 );
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 54a6f567dfb6bae3c83e67f9d6b3ea4aa066ea14..221e0cb13e41619ddbf710566e1fb395aaf61956 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -14,15 +14,22 @@
 "Database password" => "Password database",
 "Database name" => "Nama database",
 "Advanced" => "Tingkat Lanjut",
-"Table prefix" => "Awalan tabel",
+"Database host" => "Host database",
 "Data folder" => "Folder data",
 "Finish setup" => "Selesaikan instalasi",
-"gives you the freedom to control your own data on the internet" => "memberikan anda kebebasan dalam mengendalikan data anda di internet",
+"gives you freedom and control over your own data" => "memberikan anda kebebasan dan kendali atas data anda sendiri",
 "Log out" => "Keluar",
 "Settings" => "Setelan",
+"Lost your password?" => "Lupa password anda?",
 "remember" => "selalu login",
 "You are logged out." => "Anda telah keluar.",
+"You will receive a link to reset your password via Email." => "Anda akan menerima tautan untuk menset ulang password anda via Email.",
+"Requested" => "Telah diminta",
 "Login failed!" => "Gagal masuk!",
+"Username or Email" => "Nama Pengguna atau Email",
+"Request reset" => "Meminta set ulang",
 "prev" => "sebelum",
-"next" => "selanjutnya"
+"next" => "selanjutnya",
+"New password" => "Password Baru",
+"Reset password" => "Set Ulang Password"
 );
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 55fc18c264dc6ff4bac2ad012194425c417a777d..4391b53fc541052ad24802bee5eb01e9a5af93c8 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -2,6 +2,7 @@
 "Personal" => "Personale",
 "Users" => "Utenti",
 "Apps" => "Applicazioni",
+"Admin" => "Admin",
 "Help" => "Aiuto",
 "Cloud not found" => "Cloud non trovata",
 "Create an <strong>admin account</strong>" => "Crea un &lt;strong&gt;account amministratore&lt;/strong&gt;",
@@ -13,15 +14,15 @@
 "Database password" => "Password database",
 "Database name" => "Nome database",
 "Advanced" => "Opzioni avanzate",
-"Table prefix" => "Prefisso tabella",
 "Data folder" => "Cartella dati",
 "Finish setup" => "Termina",
-"gives you the freedom to control your own data on the internet" => "da la libertà di controllare i tuoi dati su internet",
 "Log out" => "Log out",
 "Settings" => "Impostazioni",
+"Lost your password?" => "Password persa?",
 "remember" => "ricorda",
 "You are logged out." => "Sei uscito.",
 "Login failed!" => "Login fallito!",
 "prev" => "precedente",
-"next" => "successivo"
+"next" => "successivo",
+"New password" => "Nuova password"
 );
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 4a6ea3af0b9c93cd1cedbf5ec7e3d65deec64698..705e44b5c53394f3f2e7fa3eab9ab812562706ed 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -14,10 +14,8 @@
 "Database password" => "Datebank Passwuert",
 "Database name" => "Datebank Numm",
 "Advanced" => "Erweidert",
-"Table prefix" => "Tabellen Präfix",
 "Data folder" => "Daten Dossier",
 "Finish setup" => "Installatioun ofschléissen",
-"gives you the freedom to control your own data on the internet" => "gëtt Dir d'Fräiheet deng eegen Daten um Internet ze kontrolléieren ",
 "Log out" => "Ausloggen",
 "Settings" => "Astellungen",
 "remember" => "verhalen",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index f58d238e88d848f5dee848b6b396030f11b29d54..07b176e4985d63483f4e6a50cfe2260e4a28db7c 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -14,10 +14,8 @@
 "Database password" => "Databasepassord",
 "Database name" => "Databasenavn",
 "Advanced" => "Avansert",
-"Table prefix" => "Tabellprefix",
 "Data folder" => "Datamappe",
 "Finish setup" => "Fullfør oppsetting",
-"gives you the freedom to control your own data on the internet" => "gir deg friheten til å kontrollere dine egne data på internettet",
 "Log out" => "Logg ut",
 "Settings" => "Innstillinger",
 "remember" => "husk",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 728c69ba4f6b7618db5e993542d6fd07b015b444..74a5182be405ddd0b0149dc56fd6f8c084c318e4 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -14,10 +14,8 @@
 "Database password" => "Wachtwoord databank",
 "Database name" => "Naam databank",
 "Advanced" => "Geavanceerd",
-"Table prefix" => "Voorvoegsel tabel",
 "Data folder" => "Gegevensmap",
 "Finish setup" => "Installatie afronden",
-"gives you the freedom to control your own data on the internet" => "geeft u de vrijheid om uw eigen gegevens te beheren op internet",
 "Log out" => "Afmelden",
 "Settings" => "Instellingen",
 "remember" => "onthoud gegevens",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 5d0bcba9beba4376965f5e9feccb2396d75dc89d..49bf7ab72710ba6bbef8f73e09f6727d747cf10c 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -14,15 +14,21 @@
 "Database password" => "Hasło do bazy danych",
 "Database name" => "Nazwa bazy danych",
 "Advanced" => "Zaawansowane",
-"Table prefix" => "Prefiks tablicy",
+"Database host" => "Host bazy danych",
 "Data folder" => "Katalog danych",
 "Finish setup" => "Zakończ instalację",
-"gives you the freedom to control your own data on the internet" => "daje Ci wolność kontroli nad Twoimi danymi w Internecie",
 "Log out" => "Wyloguj się",
 "Settings" => "Ustawienia",
+"Lost your password?" => "Nie pamiętasz hasła?",
 "remember" => "zapamiętaj",
 "You are logged out." => "Zostałeś wylogowany.",
+"You will receive a link to reset your password via Email." => "Otrzymasz link do resetowania hasła poprzez e-mail.",
+"Requested" => "Żądane",
 "Login failed!" => "Nie udało się zalogować!",
+"Username or Email" => "Użytkownik lub email",
+"Request reset" => "Zresetuj hasło",
 "prev" => "wstecz",
-"next" => "dalej"
+"next" => "dalej",
+"New password" => "Nowe hasło",
+"Reset password" => "Zresetuj hasło"
 );
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index ecf47e36c48cb94ccae1ae7312845026f974a5d8..6fa33e65b8ad63a431bc1210804c63078fd4844d 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -14,10 +14,8 @@
 "Database password" => "Senha do banco de dados",
 "Database name" => "Nome do banco de dados",
 "Advanced" => "Avançado",
-"Table prefix" => "Prefixo da tabela",
 "Data folder" => "Pasta de dados",
 "Finish setup" => "Concluir configuração",
-"gives you the freedom to control your own data on the internet" => "te dá a liberdade de controlar seus próprios dados na internet",
 "Log out" => "Sair",
 "Settings" => "Configurações",
 "remember" => "lembrete",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index daefc848ba7c32041587b2284c5d330537bb0b94..1ead055905fbbc4894bfc1ff2d25231914115a03 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -14,10 +14,8 @@
 "Database password" => "Parola bazei de date",
 "Database name" => "Numele bazei de date",
 "Advanced" => "Avansat",
-"Table prefix" => "Prefix",
 "Data folder" => "Directorul cu date",
 "Finish setup" => "Finalizează instalarea",
-"gives you the freedom to control your own data on the internet" => "îți dă libertatea de a-ți controla propriile date pe internet",
 "Log out" => "Ieșire",
 "Settings" => "Setări",
 "remember" => "ține minte",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index d9ca7ed9083f816a09f404bb4759d392e3ad6f59..110a7495af0eabec22e1e483f980b8f1c893a407 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -15,10 +15,9 @@
 "Database name" => "Название базы данных",
 "Advanced" => "Дополнительно",
 "Database host" => "Хост базы данных",
-"Table prefix" => "Префикс для таблиц",
 "Data folder" => "Директория с данными",
 "Finish setup" => "Завершить установку",
-"gives you the freedom to control your own data on the internet" => "дает Вам свободу управления Вашими данными в сети Интернет",
+"gives you freedom and control over your own data" => "даёт Вам свободу и контроль над Вашими данными",
 "Log out" => "Выйти",
 "Settings" => "Настройки",
 "Lost your password?" => "Забыли пароль?",
@@ -31,7 +30,6 @@
 "Request reset" => "Запросить сброс",
 "prev" => "пред",
 "next" => "след",
-"Your password was successfully reset" => "Ваш пароль был сброшен",
 "New password" => "Новый пароль",
 "Reset password" => "Сбросить пароль"
 );
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index c684f7f40c758f2e24d1a9374027ba32d3c3f89a..3475d81f94247c229a094d2bea038b8d7633f491 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -12,10 +12,8 @@
 "Database password" => "Databas-lösenord",
 "Database name" => "Databasnamn",
 "Advanced" => "Avancerat",
-"Table prefix" => "Tabellprefix",
 "Data folder" => "Datamapp",
 "Finish setup" => "Avsluta installation",
-"gives you the freedom to control your own data on the internet" => "ger dig friheten att hantera ditt eget data på internet",
 "Settings" => "Inställningar",
 "remember" => "kom ihåg",
 "You are logged out." => "Du är utloggad",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index b60cd759ce65e9e2c00a9e1da861dae54c9f3862..8f1b8d4f8aa41051a3eb5e4ee03a8060abe0c1b9 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -15,10 +15,8 @@
 "Database name" => "数据库名",
 "Advanced" => "高级",
 "Database host" => "数据库主机",
-"Table prefix" => "表名前缀",
 "Data folder" => "数据目录",
 "Finish setup" => "安装完成",
-"gives you the freedom to control your own data on the internet" => "在网络上为您提供自由的数据访问",
 "Log out" => "注销",
 "Settings" => "设置",
 "Lost your password?" => "忘记密码？",
@@ -31,7 +29,6 @@
 "Request reset" => "请求重置",
 "prev" => "上一页",
 "next" => "下一页",
-"Your password was successfully reset" => "您的密码已成功重置。",
 "New password" => "新密码",
 "Reset password" => "重置密码"
 );
diff --git a/core/templates/installation.php b/core/templates/installation.php
index c3cd2968c859db01fea0587413264bf20a1605ba..09f9ad8c359d6f1c18deae359a81241ed96224de 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -64,8 +64,6 @@
 			<input type="text" name="dbuser" id="dbuser" value="<?php print OC_Helper::init_var('dbuser'); ?>" placeholder="<?php echo $l->t( 'Database user' ); ?>" autocomplete="off" />
 			<input type="password" name="dbpass" id="dbpass" value="<?php print OC_Helper::init_var('dbpass'); ?>" placeholder="<?php echo $l->t( 'Database password' ); ?>" />
 			<input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" placeholder="<?php echo $l->t( 'Database name' ); ?>" autocomplete="off" />
-			
-			
 		</div>
 		<?php endif; ?>
 
@@ -75,8 +73,6 @@
 
 	<fieldset id='datadirField'>
 		<label id="dbhostlabel" for="dbhost"><?php echo $l->t( 'Database host' ); ?></label><input type="text" name="dbhost" id="dbhost" value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" placeholder="<?php echo $l->t( 'Database host' ); ?>" />
-		<label id="dbtableprefixlabel" for="dbtableprefix"><?php echo $l->t( 'Table prefix' ); ?></label><input type="text" name="dbtableprefix" id="dbtableprefix" value="<?php print OC_Helper::init_var('dbtableprefix', 'oc_'); ?>" placeholder="<?php echo $l->t( 'Table prefix' ); ?>" />
-
 		<label id="directorylabel" for="directory"><?php echo $l->t( 'Data folder' ); ?></label><input type="text" name="directory" id="directory" value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" placeholder="<?php echo $l->t( 'Data folder' ); ?>" />
 	</fieldset>
 
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 35c4378fc987c80da1f1826b5e2bbeecd9518be4..6f40619f5f5d1883381eed7963b5bcad9a2eccf3 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -32,6 +32,6 @@
 			</div></header>
 			<?php echo $_['content']; ?>
 		</div>
-		<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> <?php echo $l->t( 'gives you the freedom to control your own data on the internet' ); ?></p></footer>
+		<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> <?php echo $l->t( 'gives you freedom and control over your own data' ); ?></p></footer>
 	</body>
 </html>
diff --git a/core/templates/resetpassword.php b/core/templates/resetpassword.php
index 47d0e69b7d3c5421e64da5af126c6f1e58fe8107..2f43a93cfb595a7d7b7025f370c5786ff6c200d6 100644
--- a/core/templates/resetpassword.php
+++ b/core/templates/resetpassword.php
@@ -1,10 +1,10 @@
-<form action="<?php echo "index.php?".$_SERVER['QUERY_STRING']; ?>" method="post">
+<form action="<?php echo 'index.php?'.$_SERVER['QUERY_STRING']; ?>" method="post">
 	<fieldset>
 		<?php if($_['success']): ?>
-			<?php echo $l->t('Your password was successfully reset'); ?>
+			<?php echo $l->t('Your password was reset'); ?>
 		<?php else: ?>
 			<input type="password" name="password" id="password" placeholder="<?php echo $l->t('New password'); ?>" value="" required />
 			<input type="submit" id="submit" value="<?php echo $l->t('Reset password'); ?>" />
 		<?php endif; ?>
 	</fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 89c16d7aea3bbc8bd1ed3f585b8e93e51a615c24..8a9375d4b6fb51a1cb4b798022818beca512fa3c 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:50+0000\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 18:14+0200\n"
+"PO-Revision-Date: 2011-09-04 16:14+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -75,28 +75,24 @@ msgstr ""
 msgid "Database name"
 msgstr "Име на базата"
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr "Разширено"
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr "Префикс за таблиците"
-
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr "Директория за данни"
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
 msgstr "Завършване на настройките"
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
+msgid "gives you freedom and control over your own data"
 msgstr ""
 
 #: templates/layout.user.php:34
@@ -148,7 +144,7 @@ msgid "next"
 msgstr "следващо"
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
+msgid "Your password was reset"
 msgstr ""
 
 #: templates/resetpassword.php:6
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 104228f29f8a3c573c073ae94dfffa451b2c962c..d4fd3c4e41889c5f211aa54af464a79bbf09417a 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:50+0000\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 18:14+0200\n"
+"PO-Revision-Date: 2011-09-04 16:14+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -74,29 +74,25 @@ msgstr "Contrasenya de la base de dades"
 msgid "Database name"
 msgstr "Nom de la base de dades"
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr "Avançat"
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
-msgstr ""
-
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr "Prefix de les taules"
+msgstr "Ordinador central de la base de dades"
 
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr "Carpeta de dades"
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
 msgstr "Acaba la configuració"
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
-msgstr "us dóna la llibertat per controlar les vostres dades a internet"
+msgid "gives you freedom and control over your own data"
+msgstr "us dóna llibertat i control sobre les seves dades"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -108,7 +104,7 @@ msgstr "Arranjament"
 
 #: templates/login.php:4
 msgid "Lost your password?"
-msgstr ""
+msgstr "Heu perdut la contrasenya?"
 
 #: templates/login.php:9 templates/login.php:13
 msgid "remember"
@@ -120,11 +116,11 @@ msgstr "Heu tancat la sessió."
 
 #: templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
-msgstr ""
+msgstr "Rebreu un enllaç per correu electrònic per restablir la contrasenya"
 
 #: templates/lostpassword.php:5
 msgid "Requested"
-msgstr ""
+msgstr "Sol·licitat"
 
 #: templates/lostpassword.php:8
 msgid "Login failed!"
@@ -132,11 +128,11 @@ msgstr "L'inici de sessió ha fallat!"
 
 #: templates/lostpassword.php:10
 msgid "Username or Email"
-msgstr ""
+msgstr "Nom d'usuari o correu electrònic"
 
 #: templates/lostpassword.php:11
 msgid "Request reset"
-msgstr ""
+msgstr "Sol.licitud de restabliment"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -147,15 +143,15 @@ msgid "next"
 msgstr "següent"
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
+msgid "Your password was reset"
 msgstr ""
 
 #: templates/resetpassword.php:6
 msgid "New password"
-msgstr ""
+msgstr "Nova contrasenya"
 
 #: templates/resetpassword.php:7
 msgid "Reset password"
-msgstr ""
+msgstr "Restabliment de la contrasenya"
 
 
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index a7e06e6c1ab1b405e489e9e25daa0eb6e494b775..f13d48f0b08ca2cdffad10de4015b6d98d6f60ad 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:50+0000\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 18:14+0200\n"
+"PO-Revision-Date: 2011-09-04 16:14+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/team/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -74,29 +74,25 @@ msgstr "Heslo k databázi"
 msgid "Database name"
 msgstr "Název databáze"
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr "Rozšířené volby"
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr "Prefix tabulek"
-
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr "Datový adresář"
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
 msgstr "Dokončit instalaci"
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
-msgstr "Vám dává svobodu práce s Vaše vlastními daty na internetu"
+msgid "gives you freedom and control over your own data"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -147,7 +143,7 @@ msgid "next"
 msgstr "vpřed"
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
+msgid "Your password was reset"
 msgstr ""
 
 #: templates/resetpassword.php:6
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 87907a32888bc366050ff21206f894a31a6a2e75..18abc6b98f7da0fc96c03f12d45520db91641a94 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:50+0000\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 18:14+0200\n"
+"PO-Revision-Date: 2011-09-04 16:14+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
@@ -74,29 +74,25 @@ msgstr "Database-kodeord"
 msgid "Database name"
 msgstr "Database-navn"
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr "Tabel præfiks"
-
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr "Data mappe"
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
 msgstr "Afslut installation"
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
-msgstr "giver dig friheden til at kontrollere dine egne data på internettet"
+msgid "gives you freedom and control over your own data"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -147,7 +143,7 @@ msgid "next"
 msgstr "næste"
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
+msgid "Your password was reset"
 msgstr ""
 
 #: templates/resetpassword.php:6
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 01e94e9e4ae25489b915095cb8a6f656dc2286f6..797a2370437143a859b48ab1d319b6438f11765c 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:50+0000\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 18:14+0200\n"
+"PO-Revision-Date: 2011-09-04 16:14+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
@@ -75,30 +75,25 @@ msgstr "Datenbankpasswort"
 msgid "Database name"
 msgstr "Datenbankname"
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
-msgstr ""
-
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr "Tabellenpräfix"
+msgstr "Datenbank-Host"
 
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr "Datenverzeichnis"
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
 msgstr "Installation abschließen"
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
-msgstr ""
-"gibt dir die Freiheit, deine eigenen Daten im Internet zu kontrollieren."
+msgid "gives you freedom and control over your own data"
+msgstr "gibt dir Freiheit und Kontrolle über deine eigenen Daten"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -110,7 +105,7 @@ msgstr "Einstellungen"
 
 #: templates/login.php:4
 msgid "Lost your password?"
-msgstr ""
+msgstr "Passwort vergessen?"
 
 #: templates/login.php:9 templates/login.php:13
 msgid "remember"
@@ -118,15 +113,15 @@ msgstr "merken"
 
 #: templates/logout.php:1
 msgid "You are logged out."
-msgstr "Erfolgreich abgemeldet."
+msgstr "Abgemeldet"
 
 #: templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
-msgstr ""
+msgstr "Du wirst eine Email erhalten."
 
 #: templates/lostpassword.php:5
 msgid "Requested"
-msgstr ""
+msgstr "zurückgesetzt"
 
 #: templates/lostpassword.php:8
 msgid "Login failed!"
@@ -134,11 +129,11 @@ msgstr "Anmeldung fehlgeschlagen!"
 
 #: templates/lostpassword.php:10
 msgid "Username or Email"
-msgstr ""
+msgstr "Nutzername oder Email"
 
 #: templates/lostpassword.php:11
 msgid "Request reset"
-msgstr ""
+msgstr "Zurücksetzen"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -149,15 +144,15 @@ msgid "next"
 msgstr "Weiter"
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
+msgid "Your password was reset"
 msgstr ""
 
 #: templates/resetpassword.php:6
 msgid "New password"
-msgstr ""
+msgstr "Neues Passwort"
 
 #: templates/resetpassword.php:7
 msgid "Reset password"
-msgstr ""
+msgstr "Zurücksetzen"
 
 
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 0ce53b4bb17a0a3dc02da485e4cbe271b6f28148..9d4804387a424b3871983427eed26c61d4e068c7 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:50+0000\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 18:14+0200\n"
+"PO-Revision-Date: 2011-09-04 16:14+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
@@ -75,30 +75,25 @@ msgstr "Κωδικός πρόσβασης βάσης δεδομένων"
 msgid "Database name"
 msgstr "Όνομα βάσης δεδομένων"
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr "Πρόθεμα πίνακα"
-
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr "Φάκελος δεδομένων"
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
 msgstr "Ολοκλήρωση εγκατάστασης"
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
+msgid "gives you freedom and control over your own data"
 msgstr ""
-"σας δίνει την ελευθερία να ελέγχετε τα δικά σας δεδομένα στο διαδίκτυο"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -149,7 +144,7 @@ msgid "next"
 msgstr "επόμενο"
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
+msgid "Your password was reset"
 msgstr ""
 
 #: templates/resetpassword.php:6
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 4194528b8ab35f9ca2e1aeeb16e27d3edcae5025..97bbbb520eccd7c3e3d8a9ef4e8c2e341f360814 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:50+0000\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 18:14+0200\n"
+"PO-Revision-Date: 2011-09-04 16:14+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgstr "No se encontró la nube"
 
 #: templates/installation.php:20
 msgid "Create an <strong>admin account</strong>"
-msgstr "Crear una <strong>cuenta de administrador</strong>"
+msgstr "Crea una <strong>cuenta de administrador</strong>"
 
 #: templates/installation.php:21
 msgid "Username"
@@ -75,29 +75,25 @@ msgstr "Contraseña de la base de datos"
 msgid "Database name"
 msgstr "Nombre de la base de datos"
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
-msgstr ""
-
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr "Prefijo de la tabla"
+msgstr "Host de la base de datos"
 
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr "Directorio de almacenamiento"
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
-msgstr "Completar instalación"
+msgstr "Completar la instalación"
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
-msgstr "te da la libertad del control de tus propios datos en internet"
+msgid "gives you freedom and control over your own data"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -109,7 +105,7 @@ msgstr "Ajustes"
 
 #: templates/login.php:4
 msgid "Lost your password?"
-msgstr ""
+msgstr "¿Has perdido tu contraseña?"
 
 #: templates/login.php:9 templates/login.php:13
 msgid "remember"
@@ -121,11 +117,11 @@ msgstr "Has cerrado sesión."
 
 #: templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
-msgstr ""
+msgstr "Recibirás un link para restablecer tu contraseña vía Email."
 
 #: templates/lostpassword.php:5
 msgid "Requested"
-msgstr ""
+msgstr "Solicitado"
 
 #: templates/lostpassword.php:8
 msgid "Login failed!"
@@ -133,11 +129,11 @@ msgstr "¡No se pudo iniciar sesión!"
 
 #: templates/lostpassword.php:10
 msgid "Username or Email"
-msgstr ""
+msgstr "Nombre de usuario o Email"
 
 #: templates/lostpassword.php:11
 msgid "Request reset"
-msgstr ""
+msgstr "Solicitar restablecimiento"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -148,15 +144,15 @@ msgid "next"
 msgstr "siguiente"
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
+msgid "Your password was reset"
 msgstr ""
 
 #: templates/resetpassword.php:6
 msgid "New password"
-msgstr ""
+msgstr "Nueva contraseña"
 
 #: templates/resetpassword.php:7
 msgid "Reset password"
-msgstr ""
+msgstr "Restablecer contraseña"
 
 
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index a7baa19a3a94ab54528d2473c0e6cb841ee5a06f..a24c0688fc4811670f26f4124c96e0661202e4dc 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:50+0000\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 18:14+0200\n"
+"PO-Revision-Date: 2011-09-04 16:14+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -74,29 +74,25 @@ msgstr "Mot de passe de la base de données"
 msgid "Database name"
 msgstr "Nom de la base de données"
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr "Avancé"
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
-msgstr ""
-
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr "Préfixe des tables"
+msgstr "Serveur de la base de données"
 
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr "Répertoire des données"
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
 msgstr "Terminer l'installation"
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
-msgstr "vous rend libre de contrôler vos propres données sur internet"
+msgid "gives you freedom and control over your own data"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -108,7 +104,7 @@ msgstr "Paramètres"
 
 #: templates/login.php:4
 msgid "Lost your password?"
-msgstr ""
+msgstr "Mot de passe perdu ?"
 
 #: templates/login.php:9 templates/login.php:13
 msgid "remember"
@@ -121,10 +117,12 @@ msgstr "Vous êtes désormais déconnecté."
 #: templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
+"Vous allez recevoir un lien par email qui vous permettra de réinitialiser "
+"votre mot de passe."
 
 #: templates/lostpassword.php:5
 msgid "Requested"
-msgstr ""
+msgstr "Nécessaire"
 
 #: templates/lostpassword.php:8
 msgid "Login failed!"
@@ -132,11 +130,11 @@ msgstr "Échec de la connexion !"
 
 #: templates/lostpassword.php:10
 msgid "Username or Email"
-msgstr ""
+msgstr "Nom d'utilisateur ou Email"
 
 #: templates/lostpassword.php:11
 msgid "Request reset"
-msgstr ""
+msgstr "Demande de réinitialisation"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -147,15 +145,15 @@ msgid "next"
 msgstr "suivant"
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
+msgid "Your password was reset"
 msgstr ""
 
 #: templates/resetpassword.php:6
 msgid "New password"
-msgstr ""
+msgstr "Nouveau mot de passe"
 
 #: templates/resetpassword.php:7
 msgid "Reset password"
-msgstr ""
+msgstr "Réinitialisation du mot de passe"
 
 
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 5bb5f1dd65de24839110b812eaae386f74204c4b..46f9713e9cbf70224788388ac0ea32f4918d76bd 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -7,10 +7,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-28 01:11+0200\n"
-"PO-Revision-Date: 2011-08-26 15:34+0000\n"
-"Last-Translator: rom1dep <rom1dep@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 16:48+0200\n"
+"PO-Revision-Date: 2011-09-03 18:25+0000\n"
+"Last-Translator: bibzor <borjan@tchaka.fr>\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"
@@ -28,7 +28,7 @@ msgstr "Identifiant OpenID changé"
 
 #: ajax/openid.php:23 ajax/setlanguage.php:23
 msgid "Invalid request"
-msgstr "Requète invalide"
+msgstr "Requête invalide"
 
 #: ajax/setlanguage.php:21
 msgid "Language changed"
@@ -78,6 +78,10 @@ msgstr "sur un total de"
 msgid "Your password got changed"
 msgstr "Votre mot de passe a été changé"
 
+#: templates/personal.php:14
+msgid "Unable to change your password"
+msgstr "Impossible de changer votre mot de passe"
+
 #: templates/personal.php:15
 msgid "Current password"
 msgstr "Mot de passe actuel"
@@ -94,7 +98,7 @@ msgstr "Afficher"
 msgid "Change password"
 msgstr "Changer de mot de passe"
 
-#: templates/personal.php:24
+#: templates/personal.php:24 templates/personal.php:25
 msgid "Language"
 msgstr "Langue"
 
@@ -102,10 +106,10 @@ msgstr "Langue"
 msgid "Help translating"
 msgstr "Aider à traduire"
 
-#: templates/personal.php:36
+#: templates/personal.php:37
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
-"utilisez cette adresse pour vous connecter à votre ownCloud depuis votre "
+"utilisez cette adresse pour vous connecter à votre ownCloud depuis un "
 "explorateur de fichiers"
 
 #: templates/users.php:16
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 42df130c445deecb30ee915b18a7568ee24d62cb..b0aec1919e8fca09dae8d669fb57ac7649db649f 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:50+0000\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 18:14+0200\n"
+"PO-Revision-Date: 2011-09-04 16:14+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/team/id/)\n"
 "MIME-Version: 1.0\n"
@@ -74,29 +74,25 @@ msgstr "Password database"
 msgid "Database name"
 msgstr "Nama database"
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr "Tingkat Lanjut"
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
-msgstr ""
-
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr "Awalan tabel"
+msgstr "Host database"
 
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr "Folder data"
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
 msgstr "Selesaikan instalasi"
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
-msgstr "memberikan anda kebebasan dalam mengendalikan data anda di internet"
+msgid "gives you freedom and control over your own data"
+msgstr "memberikan anda kebebasan dan kendali atas data anda sendiri"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -108,7 +104,7 @@ msgstr "Setelan"
 
 #: templates/login.php:4
 msgid "Lost your password?"
-msgstr ""
+msgstr "Lupa password anda?"
 
 #: templates/login.php:9 templates/login.php:13
 msgid "remember"
@@ -120,11 +116,11 @@ msgstr "Anda telah keluar."
 
 #: templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
-msgstr ""
+msgstr "Anda akan menerima tautan untuk menset ulang password anda via Email."
 
 #: templates/lostpassword.php:5
 msgid "Requested"
-msgstr ""
+msgstr "Telah diminta"
 
 #: templates/lostpassword.php:8
 msgid "Login failed!"
@@ -132,11 +128,11 @@ msgstr "Gagal masuk!"
 
 #: templates/lostpassword.php:10
 msgid "Username or Email"
-msgstr ""
+msgstr "Nama Pengguna atau Email"
 
 #: templates/lostpassword.php:11
 msgid "Request reset"
-msgstr ""
+msgstr "Meminta set ulang"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -147,15 +143,15 @@ msgid "next"
 msgstr "selanjutnya"
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
+msgid "Your password was reset"
 msgstr ""
 
 #: templates/resetpassword.php:6
 msgid "New password"
-msgstr ""
+msgstr "Password Baru"
 
 #: templates/resetpassword.php:7
 msgid "Reset password"
-msgstr ""
+msgstr "Set Ulang Password"
 
 
diff --git a/l10n/it/core.po b/l10n/it/core.po
index f0c17a73b2509c396622f8dbe4ce1f7f630839ea..5551ee636bf2f460429d91c55325da0f01d6b7f1 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -2,13 +2,14 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+#   <rb.colombo@gmail.com>, 2011.
 #   <cosenal@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:50+0000\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 18:14+0200\n"
+"PO-Revision-Date: 2011-09-04 16:14+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +32,7 @@ msgstr "Applicazioni"
 
 #: strings.php:8
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: strings.php:9
 msgid "Help"
@@ -74,29 +75,25 @@ msgstr "Password database"
 msgid "Database name"
 msgstr "Nome database"
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr "Opzioni avanzate"
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr "Prefisso tabella"
-
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr "Cartella dati"
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
 msgstr "Termina"
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
-msgstr "da la libertà di controllare i tuoi dati su internet"
+msgid "gives you freedom and control over your own data"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -108,7 +105,7 @@ msgstr "Impostazioni"
 
 #: templates/login.php:4
 msgid "Lost your password?"
-msgstr ""
+msgstr "Password persa?"
 
 #: templates/login.php:9 templates/login.php:13
 msgid "remember"
@@ -147,12 +144,12 @@ msgid "next"
 msgstr "successivo"
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
+msgid "Your password was reset"
 msgstr ""
 
 #: templates/resetpassword.php:6
 msgid "New password"
-msgstr ""
+msgstr "Nuova password"
 
 #: templates/resetpassword.php:7
 msgid "Reset password"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 929431d154fdcb59e50158d40942c88039f72931..8e0042ea43d2c49c4415c5ef51fd5bfa3b39d75e 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -2,15 +2,16 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+#   <rb.colombo@gmail.com>, 2011.
 # Francesco Apruzzese <cescoap@gmail.com>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-28 01:13+0200\n"
-"PO-Revision-Date: 2011-08-27 23:13+0000\n"
-"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 16:48+0200\n"
+"PO-Revision-Date: 2011-09-04 12:49+0000\n"
+"Last-Translator: RColombo <rb.colombo@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"
@@ -36,7 +37,7 @@ msgstr "Lingua modificata"
 
 #: templates/apps.php:8
 msgid "Add your application"
-msgstr ""
+msgstr "Aggiungi un applicazione"
 
 #: templates/apps.php:21
 msgid "Select an App"
@@ -56,7 +57,7 @@ msgstr "Fai una domanda"
 
 #: templates/help.php:17
 msgid "Problems connecting to help database."
-msgstr "Problemi di connessione al database di aiutare."
+msgstr "Problemi di connessione al database di aiuto"
 
 #: templates/help.php:18
 msgid "Go there manually."
@@ -80,7 +81,7 @@ msgstr "La tua password è stata cambiata"
 
 #: templates/personal.php:14
 msgid "Unable to change your password"
-msgstr ""
+msgstr "Modifica password non riuscita"
 
 #: templates/personal.php:15
 msgid "Current password"
@@ -98,7 +99,7 @@ msgstr "mostra"
 msgid "Change password"
 msgstr "Modifica password"
 
-#: templates/personal.php:24
+#: templates/personal.php:24 templates/personal.php:25
 msgid "Language"
 msgstr "Lingua"
 
@@ -106,7 +107,7 @@ msgstr "Lingua"
 msgid "Help translating"
 msgstr "Aiuta nella traduzione"
 
-#: templates/personal.php:36
+#: templates/personal.php:37
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 "usa questo indirizzo per connettersi al proprio ownCloud nel tuo file "
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index b3eeb8cbfea8beff3d42e88c2fa2e9ee729d4764..476e57f8bb6b16b3e5518e1c40a9090db57c1bdf 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:50+0000\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 18:14+0200\n"
+"PO-Revision-Date: 2011-09-04 16:14+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/team/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -74,29 +74,25 @@ msgstr "Datebank Passwuert"
 msgid "Database name"
 msgstr "Datebank Numm"
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr "Erweidert"
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr "Tabellen Präfix"
-
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr "Daten Dossier"
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
 msgstr "Installatioun ofschléissen"
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
-msgstr "gëtt Dir d'Fräiheet deng eegen Daten um Internet ze kontrolléieren "
+msgid "gives you freedom and control over your own data"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -147,7 +143,7 @@ msgid "next"
 msgstr "weider"
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
+msgid "Your password was reset"
 msgstr ""
 
 #: templates/resetpassword.php:6
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 6b4879ad44b64efe149d74da817cbfb3f59ecdd2..018c1d81e7aec58a82314322c6a4e453de6b888a 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:50+0000\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 18:14+0200\n"
+"PO-Revision-Date: 2011-09-04 16:14+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/team/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -74,29 +74,25 @@ msgstr "Databasepassord"
 msgid "Database name"
 msgstr "Databasenavn"
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr "Avansert"
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr "Tabellprefix"
-
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
 msgstr "Fullfør oppsetting"
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
-msgstr "gir deg friheten til å kontrollere dine egne data på internettet"
+msgid "gives you freedom and control over your own data"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -147,7 +143,7 @@ msgid "next"
 msgstr "neste"
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
+msgid "Your password was reset"
 msgstr ""
 
 #: templates/resetpassword.php:6
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 1781706c342283b21263352d8611e6e8567dbc35..37d7bd57e4adae03de9a448cc55ec23ad0b4f391 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:50+0000\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 18:14+0200\n"
+"PO-Revision-Date: 2011-09-04 16:14+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -75,29 +75,25 @@ msgstr "Wachtwoord databank"
 msgid "Database name"
 msgstr "Naam databank"
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr "Voorvoegsel tabel"
-
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr "Gegevensmap"
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
 msgstr "Installatie afronden"
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
-msgstr "geeft u de vrijheid om uw eigen gegevens te beheren op internet"
+msgid "gives you freedom and control over your own data"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -148,7 +144,7 @@ msgid "next"
 msgstr "volgende"
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
+msgid "Your password was reset"
 msgstr ""
 
 #: templates/resetpassword.php:6
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 8f71e8a6ef13979d0ebc69fcc9012cb826ae32ac..63dfc9651e9f6520bad66bf09fb444992019f036 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -4,13 +4,14 @@
 # 
 # Kamil Domański <kdomanski@kdemail.net>, 2011.
 #   <mosslar@gmail.com>, 2011.
+# Marcin Małecki <gerber@tkdami.net>, 2011.
 # Marcin Małecki <mosslar@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:50+0000\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 18:14+0200\n"
+"PO-Revision-Date: 2011-09-04 16:14+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -76,29 +77,25 @@ msgstr "Hasło do bazy danych"
 msgid "Database name"
 msgstr "Nazwa bazy danych"
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
-msgstr ""
-
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr "Prefiks tablicy"
+msgstr "Host bazy danych"
 
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr "Katalog danych"
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
 msgstr "Zakończ instalację"
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
-msgstr "daje Ci wolność kontroli nad Twoimi danymi w Internecie"
+msgid "gives you freedom and control over your own data"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -110,7 +107,7 @@ msgstr "Ustawienia"
 
 #: templates/login.php:4
 msgid "Lost your password?"
-msgstr ""
+msgstr "Nie pamiętasz hasła?"
 
 #: templates/login.php:9 templates/login.php:13
 msgid "remember"
@@ -122,11 +119,11 @@ msgstr "Zostałeś wylogowany."
 
 #: templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
-msgstr ""
+msgstr "Otrzymasz link do resetowania hasła poprzez e-mail."
 
 #: templates/lostpassword.php:5
 msgid "Requested"
-msgstr ""
+msgstr "Żądane"
 
 #: templates/lostpassword.php:8
 msgid "Login failed!"
@@ -134,11 +131,11 @@ msgstr "Nie udało się zalogować!"
 
 #: templates/lostpassword.php:10
 msgid "Username or Email"
-msgstr ""
+msgstr "Użytkownik lub email"
 
 #: templates/lostpassword.php:11
 msgid "Request reset"
-msgstr ""
+msgstr "Zresetuj hasło"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -149,15 +146,15 @@ msgid "next"
 msgstr "dalej"
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
+msgid "Your password was reset"
 msgstr ""
 
 #: templates/resetpassword.php:6
 msgid "New password"
-msgstr ""
+msgstr "Nowe hasło"
 
 #: templates/resetpassword.php:7
 msgid "Reset password"
-msgstr ""
+msgstr "Zresetuj hasło"
 
 
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 4c8adb5c58d172e649eec24c3f97c0d74196e20b..c5a0595d5ad19b128e5a6c7106abc247095a1af1 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:50+0000\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 18:14+0200\n"
+"PO-Revision-Date: 2011-09-04 16:14+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/owncloud/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -75,29 +75,25 @@ msgstr "Senha do banco de dados"
 msgid "Database name"
 msgstr "Nome do banco de dados"
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr "Avançado"
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr "Prefixo da tabela"
-
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr "Pasta de dados"
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
 msgstr "Concluir configuração"
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
-msgstr "te dá a liberdade de controlar seus próprios dados na internet"
+msgid "gives you freedom and control over your own data"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -148,7 +144,7 @@ msgid "next"
 msgstr "próximo"
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
+msgid "Your password was reset"
 msgstr ""
 
 #: templates/resetpassword.php:6
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index b5a32f1e2676fbf803e1142c95186f83114087f3..d573959535e68900529dcc23dd56a95d6cf1087e 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:50+0000\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 18:14+0200\n"
+"PO-Revision-Date: 2011-09-04 16:14+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/team/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -74,29 +74,25 @@ msgstr "Parola bazei de date"
 msgid "Database name"
 msgstr "Numele bazei de date"
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr "Avansat"
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr "Prefix"
-
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr "Directorul cu date"
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
 msgstr "Finalizează instalarea"
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
-msgstr "îți dă libertatea de a-ți controla propriile date pe internet"
+msgid "gives you freedom and control over your own data"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -147,7 +143,7 @@ msgid "next"
 msgstr "următorul"
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
+msgid "Your password was reset"
 msgstr ""
 
 #: templates/resetpassword.php:6
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index b2131a2424667817a59cf560974aeef94ccfa7aa..14e1e602807bd64536cdb1a8587fb9f4659184ae 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:56+0000\n"
-"Last-Translator: tonymc <tony.mccourin@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 18:14+0200\n"
+"PO-Revision-Date: 2011-09-04 16:14+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,29 +74,25 @@ msgstr "Пароль для базы данных"
 msgid "Database name"
 msgstr "Название базы данных"
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
 msgstr "Хост базы данных"
 
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr "Префикс для таблиц"
-
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr "Директория с данными"
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
 msgstr "Завершить установку"
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
-msgstr "дает Вам свободу управления Вашими данными в сети Интернет"
+msgid "gives you freedom and control over your own data"
+msgstr "даёт Вам свободу и контроль над Вашими данными"
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -147,8 +143,8 @@ msgid "next"
 msgstr "след"
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
-msgstr "Ваш пароль был сброшен"
+msgid "Your password was reset"
+msgstr ""
 
 #: templates/resetpassword.php:6
 msgid "New password"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index e7d65d9b22e95d049f89a2d316e926d7370261f0..42149eb309a6b800bd4a9a4bcd6c2b47c47a51be 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:53+0000\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 16:48+0200\n"
+"PO-Revision-Date: 2011-09-03 13:59+0000\n"
 "Last-Translator: tonymc <tony.mccourin@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgstr "Добавить ваше приложение"
 
 #: templates/apps.php:21
 msgid "Select an App"
-msgstr "Выбрать приложение"
+msgstr "Выберите приложение"
 
 #: templates/apps.php:23
 msgid "-licensed"
@@ -105,7 +105,7 @@ msgstr "Язык"
 msgid "Help translating"
 msgstr "Помощь с переводом"
 
-#: templates/personal.php:36
+#: templates/personal.php:37
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 "используйте данный адрес для подключения к ownCloud в вашем файловом "
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index c1755bf6bb6bd9c8e3ced51d1f2534de16d7f50e..85c6092cf318a050c19ac2f9ddac66ab8e351ca2 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 14:50+0200\n"
-"PO-Revision-Date: 2011-09-03 12:50+0000\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 18:14+0200\n"
+"PO-Revision-Date: 2011-09-04 16:14+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/team/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -74,29 +74,25 @@ msgstr "Databas-lösenord"
 msgid "Database name"
 msgstr "Databasnamn"
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr "Tabellprefix"
-
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr "Datamapp"
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
 msgstr "Avsluta installation"
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
-msgstr "ger dig friheten att hantera ditt eget data på internet"
+msgid "gives you freedom and control over your own data"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -147,7 +143,7 @@ msgid "next"
 msgstr "nästa"
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
+msgid "Your password was reset"
 msgstr ""
 
 #: templates/resetpassword.php:6
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 488757ca8898f59e552475992b18dc424379cdda..83af928bf44ca99af1f778eb74ddfd6f4583053c 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: 2011-09-03 15:43+0200\n"
+"POT-Creation-Date: 2011-09-04 18:15+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:746 js/calendar.js:754
+#: js/calendar.js:801 js/calendar.js:809
 msgid "You can't open more than one dialog per site!"
 msgstr ""
 
@@ -190,26 +190,18 @@ msgstr ""
 msgid "Dec."
 msgstr ""
 
-#: templates/calendar.php:36 templates/calendar.php:111
-msgid "CW"
+#: templates/calendar.php:36 templates/calendar.php:45
+msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:37
-msgid "CWs"
+#: templates/calendar.php:37 templates/calendar.php:46
+msgid "Weeks"
 msgstr ""
 
 #: templates/calendar.php:44
 msgid "Day"
 msgstr ""
 
-#: templates/calendar.php:45
-msgid "Week"
-msgstr ""
-
-#: templates/calendar.php:46
-msgid "Weeks"
-msgstr ""
-
 #: templates/calendar.php:47
 msgid "Month"
 msgstr ""
@@ -230,6 +222,10 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
+#: templates/calendar.php:111
+msgid "CW"
+msgstr ""
+
 #: templates/calendar.php:162
 msgid "There was a fail, while parsing the file."
 msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 73be6c3c7a7ca89ab8c8efc602ee4347211ed6db..4dd47a6ad7c9424d20bf9fb8683889940dd71c2e 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: 2011-09-03 15:43+0200\n"
+"POT-Creation-Date: 2011-09-04 18:15+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -74,28 +74,24 @@ msgstr ""
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr ""
-
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
 msgstr ""
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
+msgid "gives you freedom and control over your own data"
 msgstr ""
 
 #: templates/layout.user.php:34
@@ -147,7 +143,7 @@ msgid "next"
 msgstr ""
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
+msgid "Your password was reset"
 msgstr ""
 
 #: templates/resetpassword.php:6
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index ba57e4b575406229ab43383698a67b0379004602..506824425fea072d9f4ed1ff3e718b40cecc7667 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: 2011-09-03 15:43+0200\n"
+"POT-Creation-Date: 2011-09-04 18:15+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index d1a4dcc8f325e165f7c14c8d937eb8b6d515cf63..a3f3bde6fb87ac5e751f915b6d761a5fece0083c 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: 2011-09-03 15:43+0200\n"
+"POT-Creation-Date: 2011-09-04 18:15+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index c39e0580ed69284962fdcf96d27cf26af86d4714..21a744f1d84a408069858e783a00eb5e60842422 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: 2011-09-03 15:43+0200\n"
+"POT-Creation-Date: 2011-09-04 18:15+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -105,7 +105,7 @@ msgstr ""
 msgid "Help translating"
 msgstr ""
 
-#: templates/personal.php:36
+#: templates/personal.php:37
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index d15146caf1f9244d223606a97993565e1f076bc3..3276af7ed102347490704f2f523d31951d150b24 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 15:07+0200\n"
-"PO-Revision-Date: 2011-09-03 13:09+0000\n"
-"Last-Translator: csslayer <wengxt@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
+"POT-Creation-Date: 2011-09-04 18:14+0200\n"
+"PO-Revision-Date: 2011-09-04 16:14+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\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"
@@ -74,29 +74,25 @@ msgstr "数据库密码"
 msgid "Database name"
 msgstr "数据库名"
 
-#: templates/installation.php:74
+#: templates/installation.php:72
 msgid "Advanced"
 msgstr "高级"
 
-#: templates/installation.php:77
+#: templates/installation.php:75
 msgid "Database host"
 msgstr "数据库主机"
 
-#: templates/installation.php:78
-msgid "Table prefix"
-msgstr "表名前缀"
-
-#: templates/installation.php:80
+#: templates/installation.php:76
 msgid "Data folder"
 msgstr "数据目录"
 
-#: templates/installation.php:83
+#: templates/installation.php:79
 msgid "Finish setup"
 msgstr "安装完成"
 
 #: templates/layout.guest.php:35
-msgid "gives you the freedom to control your own data on the internet"
-msgstr "在网络上为您提供自由的数据访问"
+msgid "gives you freedom and control over your own data"
+msgstr ""
 
 #: templates/layout.user.php:34
 msgid "Log out"
@@ -147,8 +143,8 @@ msgid "next"
 msgstr "下一页"
 
 #: templates/resetpassword.php:4
-msgid "Your password was successfully reset"
-msgstr "您的密码已成功重置。"
+msgid "Your password was reset"
+msgstr ""
 
 #: templates/resetpassword.php:6
 msgid "New password"
diff --git a/lib/setup.php b/lib/setup.php
index baaa2f7046579abc68b37ae9cced36c3bb7bc988..ebdf3ef823e66a3c02b480303a2945ec52a15d7c 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -64,9 +64,6 @@ class OC_Setup {
 			if(empty($options['dbhost'])) {
 				$error[] = "$dbprettyname set the database host.";
 			}
-			if(!isset($options['dbtableprefix'])) {
-				$error[] = "$dbprettyname set a table prefix.";
-			}
 		}
 
 		if(count($error) == 0) { //no errors, good
@@ -88,10 +85,10 @@ class OC_Setup {
 				$dbpass = $options['dbpass'];
 				$dbname = $options['dbname'];
 				$dbhost = $options['dbhost'];
-				$dbtableprefix = $options['dbtableprefix'];
+				$dbtableprefix = 'oc_';
 				OC_Config::setValue('dbname', $dbname);
 				OC_Config::setValue('dbhost', $dbhost);
-				OC_Config::setValue('dbtableprefix', $dbtableprefix);
+				OC_Config::setValue('dbtableprefix', 'oc_');
 
 				//check if the database user has admin right
 				$connection = @mysql_connect($dbhost, $dbuser, $dbpass);
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 769d1e9e6acc06550f1cf03b3df77dde92d215d5..74efb60fca29af15e82ec209b5871cc3cbb78208 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Authentication error" => "Erreur d'authentification",
 "OpenID Changed" => "Identifiant OpenID changé",
-"Invalid request" => "Requète invalide",
+"Invalid request" => "Requête invalide",
 "Language changed" => "Langue changée",
 "Add your application" => "Ajoutez votre application",
 "Select an App" => "Sélectionner une Application",
@@ -14,13 +14,14 @@
 "You use" => "Vous utilisez",
 "of the available" => "sur un total de",
 "Your password got changed" => "Votre mot de passe a été changé",
+"Unable to change your password" => "Impossible de changer votre mot de passe",
 "Current password" => "Mot de passe actuel",
 "New password" => "Nouveau mot de passe",
 "show" => "Afficher",
 "Change password" => "Changer de mot de passe",
 "Language" => "Langue",
 "Help translating" => "Aider à traduire",
-"use this address to connect to your ownCloud in your file manager" => "utilisez cette adresse pour vous connecter à votre ownCloud depuis votre explorateur de fichiers",
+"use this address to connect to your ownCloud in your file manager" => "utilisez cette adresse pour vous connecter à votre ownCloud depuis un explorateur de fichiers",
 "Name" => "Nom",
 "Password" => "Mot de passe",
 "Groups" => "Groupes",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index fd1593717b561b90c0888694091d5b656b8aab97..54f6c019ba2b3ccee406cda8f619486847911e15 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -3,16 +3,18 @@
 "OpenID Changed" => "OpenID Modificato",
 "Invalid request" => "Richiesta non valida",
 "Language changed" => "Lingua modificata",
+"Add your application" => "Aggiungi un applicazione",
 "Select an App" => "Seleziona un applicazione",
 "-licensed" => "-licensed",
 "by" => "da",
 "Ask a question" => "Fai una domanda",
-"Problems connecting to help database." => "Problemi di connessione al database di aiutare.",
+"Problems connecting to help database." => "Problemi di connessione al database di aiuto",
 "Go there manually." => "Vai lì manualmente.",
 "Answer" => "Risposta",
 "You use" => "Si utilizza",
 "of the available" => "su un totale di",
 "Your password got changed" => "La tua password è stata cambiata",
+"Unable to change your password" => "Modifica password non riuscita",
 "Current password" => "Password attuale",
 "New password" => "Nuova password",
 "show" => "mostra",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 12978bca2451d5188b6061813089ec80332e5783..96ca95e583f95827748506963c8296b36127e332 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -4,7 +4,7 @@
 "Invalid request" => "Неверный запрос",
 "Language changed" => "Язык изменён",
 "Add your application" => "Добавить ваше приложение",
-"Select an App" => "Выбрать приложение",
+"Select an App" => "Выберите приложение",
 "-licensed" => "-лицензия",
 "by" => "от",
 "Ask a question" => "Задать вопрос",