diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
new file mode 100644
index 0000000000..97a125faff
--- /dev/null
+++ b/apps/files/l10n/si_LK.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "නිවැරදි ව ගොනුව උඩුගත කෙරිනි",
+"The uploaded file was only partially uploaded" => "උඩුගත කළ ගොනුවේ කොටසක් පමණක් උඩුගත විය",
+"No file was uploaded" => "කිසිදු ගොනවක් උඩුගත නොවිනි",
+"Files" => "ගොනු",
+"Name" => "නම",
+"Size" => "ප්‍රමාණය",
+"folder" => "ෆෝල්ඩරය",
+"folders" => "ෆෝල්ඩර",
+"file" => "ගොනුව",
+"files" => "ගොනු",
+"Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්‍රමාණය",
+"New" => "නව",
+"Folder" => "ෆෝල්ඩරය",
+"Upload" => "උඩුගත කිරීම",
+"Nothing in here. Upload something!" => "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න",
+"Download" => "බාගත කිරීම"
+);
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index d79f195597..59385dd686 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -24,12 +24,12 @@ if (isset($_GET['token'])) {
 if (isset($_GET['file']) || isset($_GET['dir'])) {
 	if (isset($_GET['dir'])) {
 		$type = 'folder';
-		$path = $_GET['dir'];
+		$path = OC_Filesystem::normalizePath($_GET['dir']);
 		$baseDir = $path;
 		$dir = $baseDir;
 	} else {
 		$type = 'file';
-		$path = $_GET['file'];
+		$path = OC_Filesystem::normalizePath($_GET['file']);
 	}
 	$uidOwner = substr($path, 1, strpos($path, '/', 1) - 1);
 	if (OCP\User::userExists($uidOwner)) {
diff --git a/apps/user_ldap/l10n/ru_RU.php b/apps/user_ldap/l10n/ru_RU.php
index 8433f39e83..d5adb9fffd 100644
--- a/apps/user_ldap/l10n/ru_RU.php
+++ b/apps/user_ldap/l10n/ru_RU.php
@@ -4,23 +4,31 @@
 "Base DN" => "База DN",
 "You can specify Base DN for users and groups in the Advanced tab" => "Вы можете задать Base DN для пользователей и групп во вкладке «Дополнительно»",
 "User DN" => "DN пользователя",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN клиентского пользователя, с которого должна осуществляться привязка, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте поля DN и Пароль пустыми.",
 "Password" => "Пароль",
 "For anonymous access, leave DN and Password empty." => "Для анонимного доступа оставьте поля DN и пароль пустыми.",
 "User Login Filter" => "Фильтр имен пользователей",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Задает фильтр, применяемый при загрузке пользователя. %%uid заменяет имя пользователя при входе.",
 "use %%uid placeholder, e.g. \"uid=%%uid\"" => "используйте %%uid заполнитель, например, \"uid=%%uid\"",
+"User List Filter" => "Фильтр списка пользователей",
+"Defines the filter to apply, when retrieving users." => "Задает фильтр, применяемый при получении пользователей.",
 "without any placeholder, e.g. \"objectClass=person\"." => "без каких-либо заполнителей, например, \"objectClass=person\".",
 "Group Filter" => "Групповой фильтр",
+"Defines the filter to apply, when retrieving groups." => "Задает фильтр, применяемый при получении групп.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "без каких-либо заполнителей, например, \"objectClass=posixGroup\".",
 "Port" => "Порт",
 "Base User Tree" => "Базовое дерево пользователей",
+"Base Group Tree" => "Базовое дерево групп",
 "Group-Member association" => "Связь член-группа",
 "Use TLS" => "Использовать TLS",
 "Do not use it for SSL connections, it will fail." => "Не используйте это SSL-соединений, это не будет выполнено.",
 "Case insensitve LDAP server (Windows)" => "Нечувствительный к регистру LDAP-сервер (Windows)",
 "Turn off SSL certificate validation." => "Выключить проверку сертификата SSL.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Если соединение работает только с этой опцией, импортируйте SSL-сертификат LDAP сервера в ваш ownCloud сервер.",
 "Not recommended, use for testing only." => "Не рекомендовано, используйте только для тестирования.",
 "User Display Name Field" => "Поле, отображаемое как имя пользователя",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "Атрибут LDAP, используемый для создания имени пользователя в ownCloud.",
+"Group Display Name Field" => "Поле, отображаемое как имя группы",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "Атрибут LDAP, используемый для создания группового имени в ownCloud.",
 "in bytes" => "в байтах",
 "in seconds. A change empties the cache." => "в секундах. Изменение очищает кэш.",
diff --git a/config/config.sample.php b/config/config.sample.php
index 09eb6053c2..3d0a70db1d 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -30,6 +30,12 @@ $CONFIG = array(
 /* Force use of HTTPS connection (true = use HTTPS) */
 "forcessl" => false,
 
+/* Enhanced auth forces users to enter their password again when performing potential sensitive actions like creating or deleting users */
+"enhancedauth" => true,
+
+/* Time in seconds how long an user is authenticated without entering his password again before performing sensitive actions like creating or deleting users etc...*/
+"enhancedauthtime" => 15 * 60,
+
 /* Theme to use for ownCloud */
 "theme" => "",
 
@@ -86,6 +92,9 @@ $CONFIG = array(
 /* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
 "loglevel" => "",
 
+/* Lifetime of the remember login cookie, default is 15 days */
+"remember_login_cookie_lifetime" => 60*60*24*15,
+
 /* The directory where the user data is stored, default to data in the owncloud
  * directory. The sqlite database is also stored here, when sqlite is used.
  */
@@ -104,4 +113,4 @@ $CONFIG = array(
 		'writable' => true,
   ),
  ),
-);
\ No newline at end of file
+);
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 70286040bf..08b150467f 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -69,6 +69,9 @@
 "Cloud not found" => "No s'ha trobat el núvol",
 "Edit categories" => "Edita les categories",
 "Add" => "Afegeix",
+"Security Warning" => "Avís de seguretat",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No està disponible el generador de nombres aleatoris segurs, habiliteu l'extensió de PHP OpenSSL.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sense un generador de nombres aleatoris segurs un atacant podria predir els senyals per restablir la contrasenya i prendre-us el compte.",
 "Create an <strong>admin account</strong>" => "Crea un <strong>compte d'administrador</strong>",
 "Advanced" => "Avançat",
 "Data folder" => "Carpeta de dades",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 461bed9933..396f316b48 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -69,6 +69,9 @@
 "Cloud not found" => "Cloud nebyl nalezen",
 "Edit categories" => "Upravit kategorie",
 "Add" => "Přidat",
+"Security Warning" => "Bezpečnostní upozornění",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Není dostupný žádný bezpečný generátor náhodných čísel. Povolte, prosím, rozšíření OpenSSL v PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpečného generátoru náhodných čísel může útočník předpovědět token pro obnovu hesla a převzít kontrolu nad Vaším účtem.",
 "Create an <strong>admin account</strong>" => "Vytvořit <strong>účet správce</strong>",
 "Advanced" => "Pokročilé",
 "Data folder" => "Složka s daty",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 31cfa764f9..1d2daeef03 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -69,6 +69,9 @@
 "Cloud not found" => "Cloud nicht gefunden",
 "Edit categories" => "Kategorien bearbeiten",
 "Add" => "Hinzufügen",
+"Security Warning" => "Sicherheitshinweis",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktivieren Sie die PHP-Erweiterung für OpenSSL",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage die Tokens für das Zurücksetzen der Passwörter vorherzusehen und damit können Konten übernommen.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
 "Advanced" => "Fortgeschritten",
 "Data folder" => "Datenverzeichnis",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 0e0c43b899..f2b9a48fe1 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -69,6 +69,7 @@
 "Cloud not found" => "Δεν βρέθηκε σύννεφο",
 "Edit categories" => "Επεξεργασία κατηγορίας",
 "Add" => "Προσθήκη",
+"Security Warning" => "Προειδοποίηση Ασφαλείας",
 "Create an <strong>admin account</strong>" => "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
 "Advanced" => "Για προχωρημένους",
 "Data folder" => "Φάκελος δεδομένων",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 4ab46a8a33..06d599f7c7 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -69,6 +69,9 @@
 "Cloud not found" => "Introuvable",
 "Edit categories" => "Modifier les catégories",
 "Add" => "Ajouter",
+"Security Warning" => "Avertissement de sécutité",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Aucun générateur de nombre aléatoire sécurisé n'est disponible, veuillez activer l'extension PHP OpenSSL",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sans générateur de nombre aléatoire sécurisé, un attaquant peut être en mesure de prédire les jetons de réinitialisation du mot de passe, et ainsi prendre le contrôle de votre compte utilisateur.",
 "Create an <strong>admin account</strong>" => "Créer un <strong>compte administrateur</strong>",
 "Advanced" => "Avancé",
 "Data folder" => "Répertoire des données",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index c586171275..71e7691241 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -69,6 +69,9 @@
 "Cloud not found" => "Nuvola non trovata",
 "Edit categories" => "Modifica le categorie",
 "Add" => "Aggiungi",
+"Security Warning" => "Avviso di sicurezza",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Non è disponibile alcun generatore di numeri casuali sicuro. Abilita l'estensione OpenSSL di PHP",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Senza un generatore di numeri casuali sicuro, un malintenzionato potrebbe riuscire a individuare i token di ripristino delle password e impossessarsi del tuo account.",
 "Create an <strong>admin account</strong>" => "Crea un <strong>account amministratore</strong>",
 "Advanced" => "Avanzate",
 "Data folder" => "Cartella dati",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 94e1d4dd4f..718af15c28 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -69,6 +69,9 @@
 "Cloud not found" => "見つかりません",
 "Edit categories" => "カテゴリを編集",
 "Add" => "追加",
+"Security Warning" => "セキュリティ警告",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "セキュアな乱数生成器が利用可能ではありません。PHPのOpenSSL拡張を有効にして下さい。",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "セキュアな乱数生成器が無い場合、攻撃者はパスワードリセットのトークンを予測してアカウントを乗っ取られる可能性があります。",
 "Create an <strong>admin account</strong>" => "<strong>管理者アカウント</strong>を作成してください",
 "Advanced" => "詳細設定",
 "Data folder" => "データフォルダ",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index c332585325..54a442bc2f 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -69,6 +69,9 @@
 "Cloud not found" => "Cloud não encontrado",
 "Edit categories" => "Editar categorias",
 "Add" => "Adicionar",
+"Security Warning" => "Aviso de Segurança",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nenhum gerador de número aleatório de segurança disponível. Habilite a extensão OpenSSL do PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sem um gerador de número aleatório de segurança, um invasor pode ser capaz de prever os símbolos de redefinição de senhas e assumir sua conta.",
 "Create an <strong>admin account</strong>" => "Criar uma <strong>conta</strong> de <strong>administrador</strong>",
 "Advanced" => "Avançado",
 "Data folder" => "Pasta de dados",
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
new file mode 100644
index 0000000000..bfccbfd3e8
--- /dev/null
+++ b/core/l10n/si_LK.php
@@ -0,0 +1,29 @@
+<?php $TRANSLATIONS = array(
+"Application name not provided." => "යෙදුම් නාමය සපයා නැත.",
+"Settings" => "සැකසුම්",
+"January" => "ජනවාරි",
+"February" => "පෙබරවාරි",
+"March" => "මාර්තු",
+"April" => "අප්‍රේල්",
+"May" => "මැයි",
+"June" => "ජූනි",
+"July" => "ජූලි",
+"August" => "අගෝස්තු",
+"September" => "සැප්තැම්බර්",
+"October" => "ඔක්තෝබර්",
+"November" => "නොවැම්බර්",
+"December" => "දෙසැම්බර්",
+"Choose" => "තෝරන්න",
+"Cancel" => "එපා",
+"No" => "නැහැ",
+"Yes" => "ඔව්",
+"Ok" => "හරි",
+"Password" => "මුර පදය ",
+"To login page" => "පිවිසුම් පිටුවට",
+"New password" => "නව මුර පදයක්",
+"Apps" => "යෙදුම්",
+"Help" => "උදව්",
+"Add" => "එක් කරන්න",
+"Data folder" => "දත්ත ෆෝල්ඩරය",
+"next" => "ඊළඟ"
+);
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 90e416fc73..2833792e0b 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -69,6 +69,9 @@
 "Cloud not found" => "Hittade inget moln",
 "Edit categories" => "Redigera kategorier",
 "Add" => "Lägg till",
+"Security Warning" => "Säkerhetsvarning",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen säker slumptalsgenerator finns tillgänglig. Du bör aktivera PHP OpenSSL-tillägget.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Utan en säker slumptalsgenerator kan angripare få möjlighet att förutsäga lösenordsåterställningar och ta över ditt konto.",
 "Create an <strong>admin account</strong>" => "Skapa ett <strong>administratörskonto</strong>",
 "Advanced" => "Avancerat",
 "Data folder" => "Datamapp",
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 426d60989a..c0b29ea909 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -26,6 +26,12 @@
 		<span><?php echo $l->t('Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.');?></span>		
 	</fieldset>
 	<?php endif; ?>
+	<?php if(!$_['htaccessWorking']): ?>
+	<fieldset style="color: #B94A48; background-color: #F2DEDE; border-color: #EED3D7;">
+		<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
+		<span><?php echo $l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.');?></span>		
+	</fieldset>
+	<?php endif; ?>
 	<fieldset>
 		<legend><?php echo $l->t( 'Create an <strong>admin account</strong>' ); ?></legend>
 		<p class="infield">
diff --git a/l10n/af/core.po b/l10n/af/core.po
index a58f8ce0ad..61c871deff 100644
--- a/l10n/af/core.po
+++ b/l10n/af/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -146,7 +146,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr ""
 
@@ -238,8 +239,8 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr ""
 
@@ -299,7 +300,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -315,48 +316,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr ""
 
@@ -368,15 +378,29 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr ""
 
@@ -391,3 +415,17 @@ msgstr ""
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr ""
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index fa1727298b..7338fcb1fa 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -147,7 +147,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "كلمة السر"
 
@@ -239,8 +240,8 @@ msgstr "تم طلب"
 msgid "Login failed!"
 msgstr "محاولة دخول فاشلة!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "إسم المستخدم"
 
@@ -300,7 +301,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -316,48 +317,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "أضف </strong>مستخدم رئيسي <strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "خيارات متقدمة"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "مجلد المعلومات"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "أسس قاعدة البيانات"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "سيتم استخدمه"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "مستخدم قاعدة البيانات"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "كلمة سر مستخدم قاعدة البيانات"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "إسم قاعدة البيانات"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "خادم قاعدة البيانات"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "انهاء التعديلات"
 
@@ -369,15 +379,29 @@ msgstr "خدمات الوب تحت تصرفك"
 msgid "Log out"
 msgstr "الخروج"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "هل نسيت كلمة السر؟"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "تذكر"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "أدخل"
 
@@ -392,3 +416,17 @@ msgstr "السابق"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "التالي"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/ar_SA/core.po b/l10n/ar_SA/core.po
index fee98bcffc..d567806a44 100644
--- a/l10n/ar_SA/core.po
+++ b/l10n/ar_SA/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -146,7 +146,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr ""
 
@@ -238,8 +239,8 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr ""
 
@@ -299,7 +300,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -315,48 +316,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr ""
 
@@ -368,15 +378,29 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr ""
 
@@ -391,3 +415,17 @@ msgstr ""
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr ""
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index c1c34e005b..cbc25fc2b3 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -150,7 +150,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Парола"
 
@@ -242,8 +243,8 @@ msgstr "Заявено"
 msgid "Login failed!"
 msgstr "Входа пропадна!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Потребител"
 
@@ -303,7 +304,7 @@ msgstr "Редактиране на категориите"
 msgid "Add"
 msgstr "Добавяне"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -319,48 +320,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Създаване на <strong>админ профил</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Разширено"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Директория за данни"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Конфигуриране на базата"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "ще се ползва"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Потребител за базата"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Парола за базата"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Име на базата"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Хост за базата"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Завършване на настройките"
 
@@ -372,15 +382,29 @@ msgstr ""
 msgid "Log out"
 msgstr "Изход"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Забравена парола?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "запомни"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Вход"
 
@@ -395,3 +419,17 @@ msgstr "пред."
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "следващо"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index d02a32199e..dc715f5e19 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -148,7 +148,8 @@ msgstr "Comparteix amb enllaç"
 msgid "Password protect"
 msgstr "Protegir amb contrasenya"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -240,8 +241,8 @@ msgstr "Sol·licitat"
 msgid "Login failed!"
 msgstr "No s'ha pogut iniciar la sessió"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Nom d'usuari"
 
@@ -301,64 +302,73 @@ msgstr "Edita les categories"
 msgid "Add"
 msgstr "Afegeix"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
-msgstr ""
+msgstr "Avís de seguretat"
 
 #: templates/installation.php:24
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "No està disponible el generador de nombres aleatoris segurs, habiliteu l'extensió de PHP OpenSSL."
 
 #: templates/installation.php:26
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
+msgstr "Sense un generador de nombres aleatoris segurs un atacant podria predir els senyals per restablir la contrasenya i prendre-us el compte."
+
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>compte d'administrador</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Avançat"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Carpeta de dades"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Configura la base de dades"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "s'usarà"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Usuari de la base de dades"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Contrasenya de la base de dades"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Nom de la base de dades"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Espai de taula de la base de dades"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Ordinador central de la base de dades"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Acaba la configuració"
 
@@ -370,15 +380,29 @@ msgstr "controleu els vostres serveis web"
 msgid "Log out"
 msgstr "Surt"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Heu perdut la contrasenya?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "recorda'm"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Inici de sessió"
 
@@ -393,3 +417,17 @@ msgstr "anterior"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "següent"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 590bd503d4..28c0ee90d9 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -150,7 +150,8 @@ msgstr "Sdílet s odkazem"
 msgid "Password protect"
 msgstr "Chránit heslem"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Heslo"
 
@@ -242,8 +243,8 @@ msgstr "Požadováno"
 msgid "Login failed!"
 msgstr "Přihlášení selhalo."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Uživatelské jméno"
 
@@ -303,64 +304,73 @@ msgstr "Upravit kategorie"
 msgid "Add"
 msgstr "Přidat"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
-msgstr ""
+msgstr "Bezpečnostní upozornění"
 
 #: templates/installation.php:24
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Není dostupný žádný bezpečný generátor náhodných čísel. Povolte, prosím, rozšíření OpenSSL v PHP."
 
 #: templates/installation.php:26
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
+msgstr "Bez bezpečného generátoru náhodných čísel může útočník předpovědět token pro obnovu hesla a převzít kontrolu nad Vaším účtem."
+
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Vytvořit <strong>účet správce</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Složka s daty"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Nastavit databázi"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "bude použito"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Uživatel databáze"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Heslo databáze"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Název databáze"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Tabulkový prostor databáze"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Hostitel databáze"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Dokončit nastavení"
 
@@ -372,15 +382,29 @@ msgstr "webové služby pod Vaší kontrolou"
 msgid "Log out"
 msgstr "Odhlásit se"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Ztratili jste své heslo?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "zapamatovat si"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Přihlásit"
 
@@ -395,3 +419,17 @@ msgstr "předchozí"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "následující"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 93c824bb4a..98ece178a5 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -153,7 +153,8 @@ msgstr "Del med link"
 msgid "Password protect"
 msgstr "Beskyt med adgangskode"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Kodeord"
 
@@ -245,8 +246,8 @@ msgstr "Forespugt"
 msgid "Login failed!"
 msgstr "Login fejlede!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Brugernavn"
 
@@ -306,7 +307,7 @@ msgstr "Rediger kategorier"
 msgid "Add"
 msgstr "Tilføj"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -322,48 +323,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Opret en <strong>administratorkonto</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "vil blive brugt"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Databasebruger"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Databasekodeord"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Navn på database"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Database tabelplads"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Databasehost"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Afslut opsætning"
 
@@ -375,15 +385,29 @@ msgstr "Webtjenester under din kontrol"
 msgid "Log out"
 msgstr "Log ud"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Mistet dit kodeord?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "husk"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Log ind"
 
@@ -398,3 +422,17 @@ msgstr "forrige"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "næste"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/de/core.po b/l10n/de/core.po
index c261cd3df4..8e023a66d6 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -159,7 +159,8 @@ msgstr "Über einen Link freigeben"
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Passwort"
 
@@ -251,8 +252,8 @@ msgstr "Angefragt"
 msgid "Login failed!"
 msgstr "Login fehlgeschlagen!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Benutzername"
 
@@ -312,64 +313,73 @@ msgstr "Kategorien bearbeiten"
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
-msgstr ""
+msgstr "Sicherheitshinweis"
 
 #: templates/installation.php:24
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktivieren Sie die PHP-Erweiterung für OpenSSL"
 
 #: templates/installation.php:26
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
+msgstr "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage die Tokens für das Zurücksetzen der Passwörter vorherzusehen und damit können Konten übernommen."
+
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Administrator-Konto</strong> anlegen"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Fortgeschritten"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Datenverzeichnis"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Datenbank einrichten"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "wird verwendet"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Datenbank-Benutzer"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Datenbank-Passwort"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Datenbank-Name"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Datenbank-Tablespace"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Datenbank-Host"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Installation abschließen"
 
@@ -381,15 +391,29 @@ msgstr "Web-Services unter Ihrer Kontrolle"
 msgid "Log out"
 msgstr "Abmelden"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Passwort vergessen?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "merken"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Einloggen"
 
@@ -404,3 +428,17 @@ msgstr "Zurück"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "Weiter"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/el/core.po b/l10n/el/core.po
index c7c201ca95..35782e6e57 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -151,7 +151,8 @@ msgstr "Διαμοιρασμός με σύνδεσμο"
 msgid "Password protect"
 msgstr "Προστασία κωδικού"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Κωδικός"
 
@@ -243,8 +244,8 @@ msgstr "Ζητήθησαν"
 msgid "Login failed!"
 msgstr "Η σύνδεση απέτυχε!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Όνομα Χρήστη"
 
@@ -304,9 +305,9 @@ msgstr "Επεξεργασία κατηγορίας"
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
-msgstr ""
+msgstr "Προειδοποίηση Ασφαλείας"
 
 #: templates/installation.php:24
 msgid ""
@@ -320,48 +321,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Φάκελος δεδομένων"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Διαμόρφωση της βάσης δεδομένων"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "θα χρησιμοποιηθούν"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Χρήστης της βάσης δεδομένων"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Κωδικός πρόσβασης βάσης δεδομένων"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Όνομα βάσης δεδομένων"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Κενά Πινάκων Βάσης Δεδομένων"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Διακομιστής βάσης δεδομένων"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Ολοκλήρωση εγκατάστασης"
 
@@ -373,15 +383,29 @@ msgstr "Υπηρεσίες web υπό τον έλεγχό σας"
 msgid "Log out"
 msgstr "Αποσύνδεση"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Ξεχάσατε τον κωδικό σας;"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "να με θυμάσαι"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Είσοδος"
 
@@ -396,3 +420,17 @@ msgstr "προηγούμενο"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "επόμενο"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index ae26e1e347..294292e186 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -149,7 +149,8 @@ msgstr "Kunhavigi per ligilo"
 msgid "Password protect"
 msgstr "Protekti per pasvorto"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Pasvorto"
 
@@ -241,8 +242,8 @@ msgstr "Petita"
 msgid "Login failed!"
 msgstr "Ensaluto malsukcesis!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Uzantonomo"
 
@@ -302,7 +303,7 @@ msgstr "Redakti kategoriojn"
 msgid "Add"
 msgstr "Aldoni"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -318,48 +319,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Krei <strong>administran konton</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Progresinta"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Datuma dosierujo"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Agordi la datumbazon"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "estos uzata"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Datumbaza uzanto"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Datumbaza pasvorto"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Datumbaza nomo"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Datumbaza tabelospaco"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Datumbaza gastigo"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Fini la instalon"
 
@@ -371,15 +381,29 @@ msgstr "TTT-servoj sub via kontrolo"
 msgid "Log out"
 msgstr "Elsaluti"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Ĉu vi perdis vian pasvorton?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "memori"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Ensaluti"
 
@@ -394,3 +418,17 @@ msgstr "maljena"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "jena"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 8ea4c97132..b69469f28d 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -155,7 +155,8 @@ msgstr "Enlace de compartir con "
 msgid "Password protect"
 msgstr "Protegido por contraseña"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Contraseña"
 
@@ -247,8 +248,8 @@ msgstr "Pedido"
 msgid "Login failed!"
 msgstr "¡Fallo al iniciar sesión!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Nombre de usuario"
 
@@ -308,7 +309,7 @@ msgstr "Editar categorías"
 msgid "Add"
 msgstr "Añadir"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -324,48 +325,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea una <strong>cuenta de administrador</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Directorio de almacenamiento"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Configurar la base de datos"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "se utilizarán"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Usuario de la base de datos"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Contraseña de la base de datos"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Nombre de la base de datos"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Espacio de tablas de la base de datos"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Host de la base de datos"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Completar la instalación"
 
@@ -377,15 +387,29 @@ msgstr "servicios web bajo tu control"
 msgid "Log out"
 msgstr "Salir"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "¿Has perdido tu contraseña?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "recuérdame"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Entrar"
 
@@ -400,3 +424,17 @@ msgstr "anterior"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "siguiente"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 690a7a4423..004bbbdbd2 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -147,7 +147,8 @@ msgstr "Compartir con link"
 msgid "Password protect"
 msgstr "Proteger con contraseña "
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Contraseña"
 
@@ -239,8 +240,8 @@ msgstr "Pedido"
 msgid "Login failed!"
 msgstr "¡Fallo al iniciar sesión!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Nombre de usuario"
 
@@ -300,7 +301,7 @@ msgstr "Editar categorías"
 msgid "Add"
 msgstr "Añadir"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -316,48 +317,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Creá una <strong>cuenta de administrador</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Directorio de almacenamiento"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Configurar la base de datos"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "se utilizarán"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Usuario de la base de datos"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Contraseña de la base de datos"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Nombre de la base de datos"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Espacio de tablas de la base de datos"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Host de la base de datos"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Completar la instalación"
 
@@ -369,15 +379,29 @@ msgstr "servicios web sobre los que tenés control"
 msgid "Log out"
 msgstr "Cerrar la sesión"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "¿Perdiste tu contraseña?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "recordame"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Entrar"
 
@@ -392,3 +416,17 @@ msgstr "anterior"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "siguiente"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 9c49d20276..6476f3b1ae 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -147,7 +147,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Parool"
 
@@ -239,8 +240,8 @@ msgstr "Kohustuslik"
 msgid "Login failed!"
 msgstr "Sisselogimine ebaõnnestus!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Kasutajanimi"
 
@@ -300,7 +301,7 @@ msgstr "Muuda kategooriaid"
 msgid "Add"
 msgstr "Lisa"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -316,48 +317,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Loo <strong>admini konto</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Lisavalikud"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Andmete kaust"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Seadista andmebaasi"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "kasutatakse"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Andmebaasi kasutaja"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Andmebaasi parool"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Andmebasi nimi"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Andmebaasi host"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Lõpeta seadistamine"
 
@@ -369,15 +379,29 @@ msgstr "veebiteenused sinu kontrolli all"
 msgid "Log out"
 msgstr "Logi välja"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Kaotasid oma parooli?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "pea meeles"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Logi sisse"
 
@@ -392,3 +416,17 @@ msgstr "eelm"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "järgm"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index aacda8aaef..c72e8ac494 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -148,7 +148,8 @@ msgstr "Elkarbanatu lotura batekin"
 msgid "Password protect"
 msgstr "Babestu pasahitzarekin"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Pasahitza"
 
@@ -240,8 +241,8 @@ msgstr "Eskatuta"
 msgid "Login failed!"
 msgstr "Saio hasierak huts egin du!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Erabiltzaile izena"
 
@@ -301,7 +302,7 @@ msgstr "Editatu kategoriak"
 msgid "Add"
 msgstr "Gehitu"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -317,48 +318,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Sortu <strong>kudeatzaile kontu<strong> bat"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Datuen karpeta"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Konfiguratu datu basea"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "erabiliko da"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Datubasearen erabiltzailea"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Datubasearen pasahitza"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Datubasearen izena"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Datu basearen taula-lekua"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Datubasearen hostalaria"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Bukatu konfigurazioa"
 
@@ -370,15 +380,29 @@ msgstr "web zerbitzuak zure kontrolpean"
 msgid "Log out"
 msgstr "Saioa bukatu"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Galdu duzu pasahitza?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "gogoratu"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Hasi saioa"
 
@@ -393,3 +417,17 @@ msgstr "aurrekoa"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "hurrengoa"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index 5c711824ef..a83a3117ca 100644
--- a/l10n/eu_ES/core.po
+++ b/l10n/eu_ES/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -146,7 +146,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr ""
 
@@ -238,8 +239,8 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr ""
 
@@ -299,7 +300,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -315,48 +316,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr ""
 
@@ -368,15 +378,29 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr ""
 
@@ -391,3 +415,17 @@ msgstr ""
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr ""
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 5b5725416a..beb8c04f5f 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -147,7 +147,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "گذرواژه"
 
@@ -239,8 +240,8 @@ msgstr "درخواست"
 msgid "Login failed!"
 msgstr "ورود ناموفق بود"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "شناسه"
 
@@ -300,7 +301,7 @@ msgstr "ویرایش گروه ها"
 msgid "Add"
 msgstr "افزودن"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -316,48 +317,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "لطفا یک <strong> شناسه برای مدیر</strong> بسازید"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "حرفه ای"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "پوشه اطلاعاتی"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "پایگاه داده برنامه ریزی شدند"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "استفاده خواهد شد"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "شناسه پایگاه داده"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "پسورد پایگاه داده"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "نام پایگاه داده"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "هاست پایگاه داده"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "اتمام نصب"
 
@@ -369,15 +379,29 @@ msgstr "سرویس وب تحت کنترل شما"
 msgid "Log out"
 msgstr "خروج"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "آیا گذرواژه تان را به یاد نمی آورید؟"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "بیاد آوری"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "ورود"
 
@@ -392,3 +416,17 @@ msgstr "بازگشت"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "بعدی"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/fi/core.po b/l10n/fi/core.po
index 3c0aadf84f..b8ba813341 100644
--- a/l10n/fi/core.po
+++ b/l10n/fi/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -146,7 +146,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr ""
 
@@ -238,8 +239,8 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr ""
 
@@ -299,7 +300,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -315,48 +316,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr ""
 
@@ -368,15 +378,29 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr ""
 
@@ -391,3 +415,17 @@ msgstr ""
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr ""
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index f44f056a9c..313e7668c1 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -153,7 +153,8 @@ msgstr "Jaa linkillä"
 msgid "Password protect"
 msgstr "Suojaa salasanalla"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Salasana"
 
@@ -245,8 +246,8 @@ msgstr "Tilattu"
 msgid "Login failed!"
 msgstr "Kirjautuminen epäonnistui!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
@@ -306,7 +307,7 @@ msgstr "Muokkaa luokkia"
 msgid "Add"
 msgstr "Lisää"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -322,48 +323,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Luo <strong>ylläpitäjän tunnus</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Datakansio"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Muokkaa tietokantaa"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "käytetään"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Tietokannan käyttäjä"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Tietokannan salasana"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Tietokannan nimi"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Tietokannan taulukkotila"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Tietokantapalvelin"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Viimeistele asennus"
 
@@ -375,15 +385,29 @@ msgstr "verkkopalvelut hallinnassasi"
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Unohditko salasanasi?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "muista"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Kirjaudu sisään"
 
@@ -398,3 +422,17 @@ msgstr "edellinen"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "seuraava"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 03013b660f..fa5216a876 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -153,7 +153,8 @@ msgstr "Partager via lien"
 msgid "Password protect"
 msgstr "Protéger par un mot de passe"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -245,8 +246,8 @@ msgstr "Demande envoyée"
 msgid "Login failed!"
 msgstr "Nom d'utilisateur ou e-mail invalide"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
@@ -306,64 +307,73 @@ msgstr "Modifier les catégories"
 msgid "Add"
 msgstr "Ajouter"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
-msgstr ""
+msgstr "Avertissement de sécutité"
 
 #: templates/installation.php:24
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Aucun générateur de nombre aléatoire sécurisé n'est disponible, veuillez activer l'extension PHP OpenSSL"
 
 #: templates/installation.php:26
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
+msgstr "Sans générateur de nombre aléatoire sécurisé, un attaquant peut être en mesure de prédire les jetons de réinitialisation du mot de passe, et ainsi prendre le contrôle de votre compte utilisateur."
+
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Créer un <strong>compte administrateur</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Avancé"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Répertoire des données"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Configurer la base de données"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "sera utilisé"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Utilisateur pour la base de données"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Mot de passe de la base de données"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Nom de la base de données"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Tablespaces de la base de données"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Serveur de la base de données"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Terminer l'installation"
 
@@ -375,15 +385,29 @@ msgstr "services web sous votre contrôle"
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Mot de passe perdu ?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "se souvenir de moi"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Connexion"
 
@@ -398,3 +422,17 @@ msgstr "précédent"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "suivant"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index ef847eb487..881d3febfb 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -19,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-09 02:03+0200\n"
-"PO-Revision-Date: 2012-10-09 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-15 15:26+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,16 +33,11 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Impossible de charger la liste depuis l'App Store"
 
-#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:15
-msgid "Authentication error"
-msgstr "Erreur d'authentification"
-
-#: ajax/creategroup.php:19
+#: ajax/creategroup.php:12
 msgid "Group already exists"
 msgstr "Ce groupe existe déjà"
 
-#: ajax/creategroup.php:28
+#: ajax/creategroup.php:21
 msgid "Unable to add group"
 msgstr "Impossible d'ajouter le groupe"
 
@@ -70,7 +65,11 @@ msgstr "Requête invalide"
 msgid "Unable to delete group"
 msgstr "Impossible de supprimer le groupe"
 
-#: ajax/removeuser.php:22
+#: ajax/removeuser.php:18 ajax/setquota.php:18 ajax/togglegroups.php:15
+msgid "Authentication error"
+msgstr "Erreur d'authentification"
+
+#: ajax/removeuser.php:27
 msgid "Unable to delete user"
 msgstr "Impossible de supprimer l'utilisateur"
 
@@ -100,7 +99,7 @@ msgstr "Activer"
 msgid "Saving..."
 msgstr "Sauvegarde..."
 
-#: personal.php:47 personal.php:48
+#: personal.php:42 personal.php:43
 msgid "__language_name__"
 msgstr "Français"
 
@@ -197,7 +196,7 @@ msgstr "Ajoutez votre application"
 
 #: templates/apps.php:11
 msgid "More Apps"
-msgstr ""
+msgstr "Plus d'applications…"
 
 #: templates/apps.php:27
 msgid "Select an App"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 2e0bf2f944..ba2c90991a 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -148,7 +148,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -240,8 +241,8 @@ msgstr "Solicitado"
 msgid "Login failed!"
 msgstr "Fallou a conexión."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Nome de usuario"
 
@@ -301,7 +302,7 @@ msgstr "Editar categorias"
 msgid "Add"
 msgstr "Engadir"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -317,48 +318,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear unha <strong>contra de administrador</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Cartafol de datos"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Configurar a base de datos"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "será utilizado"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Usuario da base de datos"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Contrasinal da base de datos"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Nome da base de datos"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Servidor da base de datos"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Rematar configuración"
 
@@ -370,15 +380,29 @@ msgstr "servizos web baixo o seu control"
 msgid "Log out"
 msgstr "Desconectar"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Perdeu o contrasinal?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "lembrar"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Conectar"
 
@@ -393,3 +417,17 @@ msgstr "anterior"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "seguinte"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/he/core.po b/l10n/he/core.po
index eb683e2fd2..ba5968dffa 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -150,7 +150,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "ססמה"
 
@@ -242,8 +243,8 @@ msgstr "נדרש"
 msgid "Login failed!"
 msgstr "הכניסה נכשלה!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "שם משתמש"
 
@@ -303,7 +304,7 @@ msgstr "עריכת הקטגוריות"
 msgid "Add"
 msgstr "הוספה"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -319,48 +320,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "יצירת <strong>חשבון מנהל</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "תיקיית נתונים"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "הגדרת מסד הנתונים"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "ינוצלו"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "שם משתמש במסד הנתונים"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "ססמת מסד הנתונים"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "שם מסד הנתונים"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "מרחב הכתובות של מסד הנתונים"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "שרת בסיס נתונים"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "סיום התקנה"
 
@@ -372,15 +382,29 @@ msgstr "שירותי רשת בשליטתך"
 msgid "Log out"
 msgstr "התנתקות"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "שכחת את ססמתך?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "שמירת הססמה"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "כניסה"
 
@@ -395,3 +419,17 @@ msgstr "הקודם"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "הבא"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index de5a741a57..9f9f0bf082 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -147,7 +147,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "पासवर्ड"
 
@@ -239,8 +240,8 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "प्रयोक्ता का नाम"
 
@@ -300,7 +301,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -316,48 +317,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "व्यवस्थापक खाता बनाएँ"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "उन्नत"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "डेटाबेस कॉन्फ़िगर करें "
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "डेटाबेस उपयोगकर्ता"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "डेटाबेस पासवर्ड"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "सेटअप समाप्त करे"
 
@@ -369,15 +379,29 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr ""
 
@@ -392,3 +416,17 @@ msgstr "पिछला"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "अगला"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 1e6530210b..9ab1d15928 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -150,7 +150,8 @@ msgstr "Djeli preko link-a"
 msgid "Password protect"
 msgstr "Zaštiti lozinkom"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Lozinka"
 
@@ -242,8 +243,8 @@ msgstr "Zahtijevano"
 msgid "Login failed!"
 msgstr "Prijava nije uspjela!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Korisničko ime"
 
@@ -303,7 +304,7 @@ msgstr "Uredi kategorije"
 msgid "Add"
 msgstr "Dodaj"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -319,48 +320,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Stvori <strong>administratorski račun</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Dodatno"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Mapa baze podataka"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Konfiguriraj bazu podataka"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "će se koristiti"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Korisnik baze podataka"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Lozinka baze podataka"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Ime baze podataka"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Database tablespace"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Poslužitelj baze podataka"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Završi postavljanje"
 
@@ -372,15 +382,29 @@ msgstr "web usluge pod vašom kontrolom"
 msgid "Log out"
 msgstr "Odjava"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Izgubili ste lozinku?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "zapamtiti"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Prijava"
 
@@ -395,3 +419,17 @@ msgstr "prethodan"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "sljedeći"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 1a43add411..20cf6de2f5 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -149,7 +149,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Jelszó"
 
@@ -241,8 +242,8 @@ msgstr "Kérés elküldve"
 msgid "Login failed!"
 msgstr "Belépés sikertelen!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Felhasználónév"
 
@@ -302,7 +303,7 @@ msgstr "Kategóriák szerkesztése"
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -318,48 +319,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Rendszergazdafiók</strong> létrehozása"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Haladó"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Adatkönyvtár"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Adatbázis konfigurálása"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "használva lesz"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Adatbázis felhasználónév"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Adatbázis jelszó"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Adatbázis név"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Adatbázis szerver"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Beállítás befejezése"
 
@@ -371,15 +381,29 @@ msgstr "webszolgáltatások az irányításod alatt"
 msgid "Log out"
 msgstr "Kilépés"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Elfelejtett jelszó?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "emlékezzen"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Bejelentkezés"
 
@@ -394,3 +418,17 @@ msgstr "Előző"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "Következő"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 7837ad8b5e..92b68ed29b 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -146,7 +146,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr ""
 
@@ -238,8 +239,8 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr ""
 
@@ -299,7 +300,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -315,48 +316,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr ""
 
@@ -368,15 +378,29 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr ""
 
@@ -391,3 +415,17 @@ msgstr ""
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr ""
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 5863372d9d..f194ff40eb 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -147,7 +147,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Contrasigno"
 
@@ -239,8 +240,8 @@ msgstr "Requestate"
 msgid "Login failed!"
 msgstr "Initio de session fallite!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Nomine de usator"
 
@@ -300,7 +301,7 @@ msgstr "Modificar categorias"
 msgid "Add"
 msgstr "Adder"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -316,48 +317,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear un <strong>conto de administration</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Avantiate"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Dossier de datos"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Configurar le base de datos"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "essera usate"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Usator de base de datos"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Contrasigno de base de datos"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Nomine de base de datos"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Hospite de base de datos"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr ""
 
@@ -369,15 +379,29 @@ msgstr "servicios web sub tu controlo"
 msgid "Log out"
 msgstr "Clauder le session"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Tu perdeva le contrasigno?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "memora"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Aperir session"
 
@@ -392,3 +416,17 @@ msgstr "prev"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "prox"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/id/core.po b/l10n/id/core.po
index b55ed5a244..2f45fed4aa 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -149,7 +149,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Password"
 
@@ -241,8 +242,8 @@ msgstr "Telah diminta"
 msgid "Login failed!"
 msgstr "Login gagal!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Username"
 
@@ -302,7 +303,7 @@ msgstr "Edit kategori"
 msgid "Add"
 msgstr "Tambahkan"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -318,48 +319,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Buat sebuah <strong>akun admin</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Tingkat Lanjut"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Folder data"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Konfigurasi database"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "akan digunakan"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Pengguna database"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Password database"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Nama database"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Host database"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Selesaikan instalasi"
 
@@ -371,15 +381,29 @@ msgstr "web service dibawah kontrol anda"
 msgid "Log out"
 msgstr "Keluar"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Lupa password anda?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "selalu login"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Masuk"
 
@@ -394,3 +418,17 @@ msgstr "sebelum"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "selanjutnya"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/id_ID/core.po b/l10n/id_ID/core.po
index ed267ebbd6..bda0015060 100644
--- a/l10n/id_ID/core.po
+++ b/l10n/id_ID/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -146,7 +146,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr ""
 
@@ -238,8 +239,8 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr ""
 
@@ -299,7 +300,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -315,48 +316,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr ""
 
@@ -368,15 +378,29 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr ""
 
@@ -391,3 +415,17 @@ msgstr ""
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr ""
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 300d95c864..656400c8b7 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -151,7 +151,8 @@ msgstr "Condividi con collegamento"
 msgid "Password protect"
 msgstr "Proteggi con password"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Password"
 
@@ -243,8 +244,8 @@ msgstr "Richiesto"
 msgid "Login failed!"
 msgstr "Accesso non riuscito!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Nome utente"
 
@@ -304,64 +305,73 @@ msgstr "Modifica le categorie"
 msgid "Add"
 msgstr "Aggiungi"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
-msgstr ""
+msgstr "Avviso di sicurezza"
 
 #: templates/installation.php:24
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Non è disponibile alcun generatore di numeri casuali sicuro. Abilita l'estensione OpenSSL di PHP"
 
 #: templates/installation.php:26
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
+msgstr "Senza un generatore di numeri casuali sicuro, un malintenzionato potrebbe riuscire a individuare i token di ripristino delle password e impossessarsi del tuo account."
+
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>account amministratore</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Cartella dati"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Configura il database"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "sarà utilizzato"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Utente del database"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Password del database"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Nome del database"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Spazio delle tabelle del database"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Host del database"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Termina la configurazione"
 
@@ -373,15 +383,29 @@ msgstr "servizi web nelle tue mani"
 msgid "Log out"
 msgstr "Esci"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Hai perso la password?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "ricorda"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Accedi"
 
@@ -396,3 +420,17 @@ msgstr "precedente"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "successivo"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index d7bb736fa7..4e57760cc5 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -148,7 +148,8 @@ msgstr "URLリンクで共有"
 msgid "Password protect"
 msgstr "パスワード保護"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "パスワード"
 
@@ -240,8 +241,8 @@ msgstr "送信されました"
 msgid "Login failed!"
 msgstr "ログインに失敗しました！"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "ユーザ名"
 
@@ -301,64 +302,73 @@ msgstr "カテゴリを編集"
 msgid "Add"
 msgstr "追加"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
-msgstr ""
+msgstr "セキュリティ警告"
 
 #: templates/installation.php:24
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "セキュアな乱数生成器が利用可能ではありません。PHPのOpenSSL拡張を有効にして下さい。"
 
 #: templates/installation.php:26
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
+msgstr "セキュアな乱数生成器が無い場合、攻撃者はパスワードリセットのトークンを予測してアカウントを乗っ取られる可能性があります。"
+
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>管理者アカウント</strong>を作成してください"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "詳細設定"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "データフォルダ"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "データベースを設定してください"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "が使用されます"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "データベースのユーザ名"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "データベースのパスワード"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "データベース名"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "データベースの表領域"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "データベースのホスト名"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "セットアップを完了します"
 
@@ -370,15 +380,29 @@ msgstr "管理下にあるウェブサービス"
 msgid "Log out"
 msgstr "ログアウト"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "パスワードを忘れましたか？"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "パスワードを記憶する"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "ログイン"
 
@@ -393,3 +417,17 @@ msgstr "前"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "次"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 17fb4b3c39..88c1e5402c 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-14 02:05+0200\n"
-"PO-Revision-Date: 2012-10-13 06:57+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-15 07:29+0000\n"
 "Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -23,16 +23,11 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "アプリストアからリストをロードできません"
 
-#: ajax/creategroup.php:9 ajax/removeuser.php:18 ajax/setquota.php:18
-#: ajax/togglegroups.php:15
-msgid "Authentication error"
-msgstr "認証エラー"
-
-#: ajax/creategroup.php:19
+#: ajax/creategroup.php:12
 msgid "Group already exists"
 msgstr "グループは既に存在しています"
 
-#: ajax/creategroup.php:28
+#: ajax/creategroup.php:21
 msgid "Unable to add group"
 msgstr "グループを追加できません"
 
@@ -60,6 +55,10 @@ msgstr "無効なリクエストです"
 msgid "Unable to delete group"
 msgstr "グループを削除できません"
 
+#: ajax/removeuser.php:18 ajax/setquota.php:18 ajax/togglegroups.php:15
+msgid "Authentication error"
+msgstr "認証エラー"
+
 #: ajax/removeuser.php:27
 msgid "Unable to delete user"
 msgstr "ユーザを削除できません"
@@ -228,7 +227,7 @@ msgstr "解答"
 #: templates/personal.php:8
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
-msgstr "現在､<strong>%s</strong> / <strong>%s<strong> を利用しています"
+msgstr "現在､ <strong>%s</strong> / <strong>%s<strong> を利用しています"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 98ff5bf957..79125bc457 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -148,7 +148,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "암호"
 
@@ -240,8 +241,8 @@ msgstr "요청함"
 msgid "Login failed!"
 msgstr "로그인 실패!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "사용자 이름"
 
@@ -301,7 +302,7 @@ msgstr "카테고리 편집"
 msgid "Add"
 msgstr "추가"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -317,48 +318,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>관리자 계정</strong>을 만드십시오"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "고급"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "자료 폴더"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "데이터베이스 구성"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "사용 될 것임"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "데이터베이스 사용자"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "데이터베이스 암호"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "데이터베이스 이름"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "데이터베이스 호스트"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "설치 완료"
 
@@ -370,15 +380,29 @@ msgstr "내가 관리하는 웹 서비스"
 msgid "Log out"
 msgstr "로그아웃"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "암호를 잊으셨습니까?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "기억하기"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "로그인"
 
@@ -393,3 +417,17 @@ msgstr "이전"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "다음"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index f4776ae7a8..56a268f7ba 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -147,7 +147,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "وشەی تێپەربو"
 
@@ -239,8 +240,8 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr ""
 
@@ -300,7 +301,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -316,48 +317,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "هه‌ڵبژاردنی پیشكه‌وتوو"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "زانیاری فۆڵده‌ر"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "به‌كارهێنه‌ری داتابه‌یس"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "وشه‌ی نهێنی داتا به‌یس"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "ناوی داتابه‌یس"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "هۆستی داتابه‌یس"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "كۆتایی هات ده‌ستكاریه‌كان"
 
@@ -369,15 +379,29 @@ msgstr ""
 msgid "Log out"
 msgstr "چوونەدەرەوە"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr ""
 
@@ -392,3 +416,17 @@ msgstr "پێشتر"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "دواتر"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 63634fa60b..eeafec6d3b 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -147,7 +147,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Passwuert"
 
@@ -239,8 +240,8 @@ msgstr "Gefrot"
 msgid "Login failed!"
 msgstr "Falschen Login!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Benotzernumm"
 
@@ -300,7 +301,7 @@ msgstr "Kategorien editéieren"
 msgid "Add"
 msgstr "Bäisetzen"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -316,48 +317,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "En <strong>Admin Account</strong> uleeën"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Advanced"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Daten Dossier"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Datebank konfiguréieren"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "wärt benotzt ginn"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Datebank Benotzer"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Datebank Passwuert"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Datebank Numm"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Datebank Tabelle-Gréisst"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Datebank Server"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Installatioun ofschléissen"
 
@@ -369,15 +379,29 @@ msgstr "Web Servicer ënnert denger Kontroll"
 msgid "Log out"
 msgstr "Ausloggen"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Passwuert vergiess?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "verhalen"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Log dech an"
 
@@ -392,3 +416,17 @@ msgstr "zeréck"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "weider"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 638e40bdbe..529ba10793 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -147,7 +147,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Slaptažodis"
 
@@ -239,8 +240,8 @@ msgstr "Užklausta"
 msgid "Login failed!"
 msgstr "Prisijungti nepavyko!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Prisijungimo vardas"
 
@@ -300,7 +301,7 @@ msgstr "Redaguoti kategorijas"
 msgid "Add"
 msgstr "Pridėti"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -316,48 +317,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Sukurti <strong>administratoriaus paskyrą</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Išplėstiniai"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Duomenų katalogas"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Nustatyti duomenų bazę"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "bus naudojama"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Duomenų bazės vartotojas"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Duomenų bazės slaptažodis"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Duomenų bazės pavadinimas"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Duomenų bazės serveris"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Baigti diegimą"
 
@@ -369,15 +379,29 @@ msgstr "jūsų valdomos web paslaugos"
 msgid "Log out"
 msgstr "Atsijungti"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Pamiršote slaptažodį?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "prisiminti"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Prisijungti"
 
@@ -392,3 +416,17 @@ msgstr "atgal"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "kitas"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index d1f63690f9..dbc6b29788 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -147,7 +147,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Parole"
 
@@ -239,8 +240,8 @@ msgstr "Obligāts"
 msgid "Login failed!"
 msgstr "Neizdevās ielogoties."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Lietotājvārds"
 
@@ -300,7 +301,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -316,48 +317,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Datu mape"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Nokonfigurēt datubāzi"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "tiks izmantots"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Datubāzes lietotājs"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Datubāzes parole"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Datubāzes nosaukums"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Datubāzes mājvieta"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Pabeigt uzstādījumus"
 
@@ -369,15 +379,29 @@ msgstr ""
 msgid "Log out"
 msgstr "Izlogoties"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Aizmirsāt paroli?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "atcerēties"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Ielogoties"
 
@@ -392,3 +416,17 @@ msgstr "iepriekšējā"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "nākamā"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 327bd73fdf..e3ef1875d1 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -149,7 +149,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Лозинка"
 
@@ -241,8 +242,8 @@ msgstr "Побарано"
 msgid "Login failed!"
 msgstr "Најавата не успеа!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Корисничко име"
 
@@ -302,7 +303,7 @@ msgstr "Уреди категории"
 msgid "Add"
 msgstr "Додади"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -318,48 +319,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Направете <strong>администраторска сметка</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Напредно"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Фолдер со податоци"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Конфигурирај ја базата"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "ќе биде користено"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Корисник на база"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Лозинка на база"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Име на база"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Сервер со база"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Заврши го подесувањето"
 
@@ -371,15 +381,29 @@ msgstr "веб сервиси под Ваша контрола"
 msgid "Log out"
 msgstr "Одјава"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Ја заборавивте лозинката?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "запамти"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Најава"
 
@@ -394,3 +418,17 @@ msgstr "претходно"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "следно"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 0d823cc7b4..d336f9d544 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -149,7 +149,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Kata laluan"
 
@@ -241,8 +242,8 @@ msgstr "Meminta"
 msgid "Login failed!"
 msgstr "Log masuk gagal!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Nama pengguna"
 
@@ -302,7 +303,7 @@ msgstr "Edit kategori"
 msgid "Add"
 msgstr "Tambah"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -318,48 +319,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "buat <strong>akaun admin</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Maju"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Fail data"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Konfigurasi pangkalan data"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "akan digunakan"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Nama pengguna pangkalan data"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Kata laluan pangkalan data"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Nama pangkalan data"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Hos pangkalan data"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Setup selesai"
 
@@ -371,15 +381,29 @@ msgstr "Perkhidmatan web di bawah kawalan anda"
 msgid "Log out"
 msgstr "Log keluar"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Hilang kata laluan?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "ingat"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Log masuk"
 
@@ -394,3 +418,17 @@ msgstr "sebelum"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "seterus"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index c2c79c1e45..baab6b280d 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -151,7 +151,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Passord"
 
@@ -243,8 +244,8 @@ msgstr "Anmodning"
 msgid "Login failed!"
 msgstr "Innloggingen var ikke vellykket."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Brukernavn"
 
@@ -304,7 +305,7 @@ msgstr "Rediger kategorier"
 msgid "Add"
 msgstr "Legg til"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -320,48 +321,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "opprett en <strong>administrator-konto</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Avansert"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "vil bli brukt"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Databasebruker"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Databasenavn"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Databasevert"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Fullfør oppsetting"
 
@@ -373,15 +383,29 @@ msgstr "nettjenester under din kontroll"
 msgid "Log out"
 msgstr "Logg ut"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Mistet passordet ditt?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "husk"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Logg inn"
 
@@ -396,3 +420,17 @@ msgstr "forrige"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "neste"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 320ba85ff3..b4220820df 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -154,7 +154,8 @@ msgstr "Deel met link"
 msgid "Password protect"
 msgstr "Passeerwoord beveiliging"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -246,8 +247,8 @@ msgstr "Gevraagd"
 msgid "Login failed!"
 msgstr "Login mislukt!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Gebruikersnaam"
 
@@ -307,7 +308,7 @@ msgstr "Wijzigen categorieën"
 msgid "Add"
 msgstr "Toevoegen"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -323,48 +324,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Maak een <strong>beheerdersaccount</strong> aan"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Gegevensmap"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Configureer de databank"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "zal gebruikt worden"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Gebruiker databank"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Wachtwoord databank"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Naam databank"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Database tablespace"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Database server"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Installatie afronden"
 
@@ -376,15 +386,29 @@ msgstr "webdiensten die je beheerst"
 msgid "Log out"
 msgstr "Afmelden"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Uw wachtwoord vergeten?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "onthoud gegevens"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Meld je aan"
 
@@ -399,3 +423,17 @@ msgstr "vorige"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "volgende"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 50d54f08e9..36653dc6fb 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -148,7 +148,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Passord"
 
@@ -240,8 +241,8 @@ msgstr "Førespurt"
 msgid "Login failed!"
 msgstr "Feil ved innlogging!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Brukarnamn"
 
@@ -301,7 +302,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -317,48 +318,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Lag ein <strong>admin-konto</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Avansert"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "vil bli nytta"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Databasebrukar"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Databasenamn"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Databasetenar"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Fullfør oppsettet"
 
@@ -370,15 +380,29 @@ msgstr "Vev tjenester under din kontroll"
 msgid "Log out"
 msgstr "Logg ut"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Gløymt passordet?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "hugs"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Logg inn"
 
@@ -393,3 +417,17 @@ msgstr "førre"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "neste"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index b8653a0809..2e89d694c3 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -147,7 +147,8 @@ msgstr "Parteja amb lo ligam"
 msgid "Password protect"
 msgstr "Parat per senhal"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Senhal"
 
@@ -239,8 +240,8 @@ msgstr "Requesit"
 msgid "Login failed!"
 msgstr "Fracàs de login"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Nom d'usancièr"
 
@@ -300,7 +301,7 @@ msgstr "Edita categorias"
 msgid "Add"
 msgstr "Ajusta"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -316,48 +317,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>compte admin</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Avançat"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Dorsièr de donadas"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Configura la basa de donadas"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "serà utilizat"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Usancièr de la basa de donadas"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Senhal de la basa de donadas"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Nom de la basa de donadas"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Espandi de taula de basa de donadas"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Òste de basa de donadas"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Configuracion acabada"
 
@@ -369,15 +379,29 @@ msgstr "Services web jos ton contraròtle"
 msgid "Log out"
 msgstr "Sortida"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "L'as perdut lo senhal ?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "bremba-te"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Dintrada"
 
@@ -392,3 +416,17 @@ msgstr "dariièr"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "venent"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index f636d05242..7e47de56d8 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -154,7 +154,8 @@ msgstr "Współdziel z link"
 msgid "Password protect"
 msgstr "Zabezpieczone hasłem"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Hasło"
 
@@ -246,8 +247,8 @@ msgstr "Żądane"
 msgid "Login failed!"
 msgstr "Nie udało się zalogować!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
@@ -307,7 +308,7 @@ msgstr "Edytuj kategorię"
 msgid "Add"
 msgstr "Dodaj"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -323,48 +324,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Tworzenie <strong>konta administratora</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Katalog danych"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Konfiguracja bazy danych"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "zostanie użyte"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Użytkownik bazy danych"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Hasło do bazy danych"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Nazwa bazy danych"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Obszar tabel bazy danych"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Komputer bazy danych"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Zakończ konfigurowanie"
 
@@ -376,15 +386,29 @@ msgstr "usługi internetowe pod kontrolą"
 msgid "Log out"
 msgstr "Wylogowuje użytkownika"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Nie pamiętasz hasła?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "Zapamiętanie"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Zaloguj"
 
@@ -399,3 +423,17 @@ msgstr "wstecz"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "naprzód"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/pl_PL/core.po b/l10n/pl_PL/core.po
index a4e184f4e4..8cf5827448 100644
--- a/l10n/pl_PL/core.po
+++ b/l10n/pl_PL/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -146,7 +146,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr ""
 
@@ -238,8 +239,8 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr ""
 
@@ -299,7 +300,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -315,48 +316,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr ""
 
@@ -368,15 +378,29 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr ""
 
@@ -391,3 +415,17 @@ msgstr ""
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr ""
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 1f1d243ea0..990a977673 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -5,6 +5,7 @@
 # Translators:
 #   <duda.nogueira@metasys.com.br>, 2011.
 # Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
+#   <henrique@meira.net>, 2012.
 #   <philippi.sedir@gmail.com>, 2012.
 # Thiago Vicente <thiagovice@gmail.com>, 2012.
 # Unforgiving Fallout <>, 2012.
@@ -13,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -152,7 +153,8 @@ msgstr "Compartilhar com link"
 msgid "Password protect"
 msgstr "Proteger com senha"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Senha"
 
@@ -244,8 +246,8 @@ msgstr "Solicitado"
 msgid "Login failed!"
 msgstr "Falha ao fazer o login!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Nome de Usuário"
 
@@ -305,64 +307,73 @@ msgstr "Editar categorias"
 msgid "Add"
 msgstr "Adicionar"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
-msgstr ""
+msgstr "Aviso de Segurança"
 
 #: templates/installation.php:24
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Nenhum gerador de número aleatório de segurança disponível. Habilite a extensão OpenSSL do PHP."
 
 #: templates/installation.php:26
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
+msgstr "Sem um gerador de número aleatório de segurança, um invasor pode ser capaz de prever os símbolos de redefinição de senhas e assumir sua conta."
+
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Criar uma <strong>conta</strong> de <strong>administrador</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Avançado"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Pasta de dados"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Configurar o banco de dados"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "será usado"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Usuário de banco de dados"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Senha do banco de dados"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Nome do banco de dados"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Espaço de tabela do banco de dados"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Banco de dados do host"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Concluir configuração"
 
@@ -374,15 +385,29 @@ msgstr "web services sob seu controle"
 msgid "Log out"
 msgstr "Sair"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Esqueçeu sua senha?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "lembrete"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Log in"
 
@@ -397,3 +422,17 @@ msgstr "anterior"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "próximo"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index a528719693..000d5c3ff3 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -150,7 +150,8 @@ msgstr "Partilhar com link"
 msgid "Password protect"
 msgstr "Proteger com palavra-passe"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Palavra chave"
 
@@ -242,8 +243,8 @@ msgstr "Pedido"
 msgid "Login failed!"
 msgstr "Conexão falhado!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Utilizador"
 
@@ -303,7 +304,7 @@ msgstr "Editar categorias"
 msgid "Add"
 msgstr "Adicionar"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -319,48 +320,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Criar uma <strong>conta administrativa</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Avançado"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Pasta de dados"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Configure a base de dados"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "vai ser usada"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Utilizador da base de dados"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Password da base de dados"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Nome da base de dados"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Tablespace da base de dados"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Host da base de dados"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Acabar instalação"
 
@@ -372,15 +382,29 @@ msgstr "serviços web sob o seu controlo"
 msgid "Log out"
 msgstr "Sair"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Esqueceu a sua password?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "lembrar"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Entrar"
 
@@ -395,3 +419,17 @@ msgstr "anterior"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "seguinte"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 8858cc6e71..27279e061f 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -150,7 +150,8 @@ msgstr "Partajare cu legătură"
 msgid "Password protect"
 msgstr "Protejare cu parolă"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Parola"
 
@@ -242,8 +243,8 @@ msgstr "Solicitat"
 msgid "Login failed!"
 msgstr "Autentificare eșuată"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Utilizator"
 
@@ -303,7 +304,7 @@ msgstr "Editează categoriile"
 msgid "Add"
 msgstr "Adaugă"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -319,48 +320,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crează un <strong>cont de administrator</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Avansat"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Director date"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Configurează baza de date"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "vor fi folosite"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Utilizatorul bazei de date"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Parola bazei de date"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Numele bazei de date"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Tabela de spațiu a bazei de date"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Bază date"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Finalizează instalarea"
 
@@ -372,15 +382,29 @@ msgstr "servicii web controlate de tine"
 msgid "Log out"
 msgstr "Ieșire"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Ai uitat parola?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "amintește"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Autentificare"
 
@@ -395,3 +419,17 @@ msgstr "precedentul"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "următorul"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index c8b1165123..fe949c2e2b 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -151,7 +151,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Пароль"
 
@@ -243,8 +244,8 @@ msgstr "Запрошено"
 msgid "Login failed!"
 msgstr "Не удалось войти!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Имя пользователя"
 
@@ -304,7 +305,7 @@ msgstr "Редактировать категории"
 msgid "Add"
 msgstr "Добавить"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -320,48 +321,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Создать <strong>учётную запись администратора</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Директория с данными"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Настройка базы данных"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "будет использовано"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Имя пользователя для базы данных"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Пароль для базы данных"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Название базы данных"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Табличое пространство базы данных"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Хост базы данных"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Завершить установку"
 
@@ -373,15 +383,29 @@ msgstr "Сетевые службы под твоим контролем"
 msgid "Log out"
 msgstr "Выйти"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Забыли пароль?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "запомнить"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Войти"
 
@@ -396,3 +420,17 @@ msgstr "пред"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "след"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index 6a9c71caa3..67a1971669 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -147,7 +147,8 @@ msgstr ""
 msgid "Password protect"
 msgstr "Защитить паролем"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Пароль"
 
@@ -239,8 +240,8 @@ msgstr "Запрашиваемое"
 msgid "Login failed!"
 msgstr "Войти не удалось!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Имя пользователя"
 
@@ -300,7 +301,7 @@ msgstr "Редактирование категорий"
 msgid "Add"
 msgstr "Добавить"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -316,48 +317,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Создать <strong>admin account</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Расширенный"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Папка данных"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Настроить базу данных"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "будет использоваться"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Пользователь базы данных"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Пароль базы данных"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Имя базы данных"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Табличная область базы данных"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Сервер базы данных"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Завершение настройки"
 
@@ -369,15 +379,29 @@ msgstr "веб-сервисы под Вашим контролем"
 msgid "Log out"
 msgstr "Выйти"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Забыли пароль?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "запомнить"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Войти"
 
@@ -392,3 +416,17 @@ msgstr "предыдущий"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "следующий"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
index 72709623ec..a66fb2f796 100644
--- a/l10n/ru_RU/user_ldap.po
+++ b/l10n/ru_RU/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-12 02:03+0200\n"
-"PO-Revision-Date: 2012-10-11 08:03+0000\n"
+"POT-Creation-Date: 2012-10-16 02:03+0200\n"
+"PO-Revision-Date: 2012-10-15 13:57+0000\n"
 "Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr ""
+msgstr "DN клиентского пользователя, с которого должна осуществляться привязка, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте поля DN и Пароль пустыми."
 
 #: templates/settings.php:11
 msgid "Password"
@@ -63,7 +63,7 @@ msgstr "Фильтр имен пользователей"
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr ""
+msgstr "Задает фильтр, применяемый при загрузке пользователя. %%uid заменяет имя пользователя при входе."
 
 #: templates/settings.php:12
 #, php-format
@@ -72,11 +72,11 @@ msgstr "используйте %%uid заполнитель, например, \
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "Фильтр списка пользователей"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Задает фильтр, применяемый при получении пользователей."
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
@@ -88,7 +88,7 @@ msgstr "Групповой фильтр"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Задает фильтр, применяемый при получении групп."
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
@@ -104,7 +104,7 @@ msgstr "Базовое дерево пользователей"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Базовое дерево групп"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
@@ -130,7 +130,7 @@ msgstr "Выключить проверку сертификата SSL."
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "Если соединение работает только с этой опцией, импортируйте SSL-сертификат LDAP сервера в ваш ownCloud сервер."
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
@@ -146,7 +146,7 @@ msgstr "Атрибут LDAP, используемый для создания и
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Поле, отображаемое как имя группы"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
new file mode 100644
index 0000000000..ff4b345ed8
--- /dev/null
+++ b/l10n/si_LK/core.po
@@ -0,0 +1,432 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Chamara Disanayake <chamara@nic.lk>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: si_LK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
+msgid "Application name not provided."
+msgstr "යෙදුම් නාමය සපයා නැත."
+
+#: ajax/vcategories/add.php:29
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:36
+msgid "This category already exists: "
+msgstr ""
+
+#: js/js.js:238 templates/layout.user.php:49 templates/layout.user.php:50
+msgid "Settings"
+msgstr "සැකසුම්"
+
+#: js/js.js:670
+msgid "January"
+msgstr "ජනවාරි"
+
+#: js/js.js:670
+msgid "February"
+msgstr "පෙබරවාරි"
+
+#: js/js.js:670
+msgid "March"
+msgstr "මාර්තු"
+
+#: js/js.js:670
+msgid "April"
+msgstr "අප්‍රේල්"
+
+#: js/js.js:670
+msgid "May"
+msgstr "මැයි"
+
+#: js/js.js:670
+msgid "June"
+msgstr "ජූනි"
+
+#: js/js.js:671
+msgid "July"
+msgstr "ජූලි"
+
+#: js/js.js:671
+msgid "August"
+msgstr "අගෝස්තු"
+
+#: js/js.js:671
+msgid "September"
+msgstr "සැප්තැම්බර්"
+
+#: js/js.js:671
+msgid "October"
+msgstr "ඔක්තෝබර්"
+
+#: js/js.js:671
+msgid "November"
+msgstr "නොවැම්බර්"
+
+#: js/js.js:671
+msgid "December"
+msgstr "දෙසැම්බර්"
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr "තෝරන්න"
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr "එපා"
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr "නැහැ"
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr "ඔව්"
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr "හරි"
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:497
+#: js/share.js:509
+msgid "Error"
+msgstr ""
+
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+msgid "Shared with you and the group"
+msgstr ""
+
+#: js/share.js:130
+msgid "by"
+msgstr ""
+
+#: js/share.js:132
+msgid "Shared with you by"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
+msgid "Password"
+msgstr "මුර පදය "
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:185
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:187
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:214
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:250
+msgid "Shared in"
+msgstr ""
+
+#: js/share.js:250
+msgid "with"
+msgstr ""
+
+#: js/share.js:271
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:283
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:285
+msgid "access control"
+msgstr ""
+
+#: js/share.js:288
+msgid "create"
+msgstr ""
+
+#: js/share.js:291
+msgid "update"
+msgstr ""
+
+#: js/share.js:294
+msgid "delete"
+msgstr ""
+
+#: js/share.js:297
+msgid "share"
+msgstr ""
+
+#: js/share.js:322 js/share.js:484
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:497
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:509
+msgid "Error setting expiration date"
+msgstr ""
+
+#: lostpassword/index.php:26
+msgid "ownCloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr "පිවිසුම් පිටුවට"
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "නව මුර පදයක්"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7
+msgid "Apps"
+msgstr "යෙදුම්"
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr "උදව්"
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:14
+msgid "Add"
+msgstr "එක් කරන්න"
+
+#: templates/installation.php:23 templates/installation.php:31
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:24
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:26
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:48
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:50
+msgid "Data folder"
+msgstr "දත්ත ෆෝල්ඩරය"
+
+#: templates/installation.php:57
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:105
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:113
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:121
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:127
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:38
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:27
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:28
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr ""
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "ඊළඟ"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
new file mode 100644
index 0000000000..0b5e050f8c
--- /dev/null
+++ b/l10n/si_LK/files.po
@@ -0,0 +1,300 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Chamara Disanayake <chamara@nic.lk>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-16 02:03+0200\n"
+"PO-Revision-Date: 2012-10-15 10:48+0000\n"
+"Last-Translator: Chamara Disanayake <chamara@nic.lk>\n"
+"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: si_LK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/upload.php:20
+msgid "There is no error, the file uploaded with success"
+msgstr "නිවැරදි ව ගොනුව උඩුගත කෙරිනි"
+
+#: ajax/upload.php:21
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/upload.php:22
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "The uploaded file was only partially uploaded"
+msgstr "උඩුගත කළ ගොනුවේ කොටසක් පමණක් උඩුගත විය"
+
+#: ajax/upload.php:24
+msgid "No file was uploaded"
+msgstr "කිසිදු ගොනවක් උඩුගත නොවිනි"
+
+#: ajax/upload.php:25
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:26
+msgid "Failed to write to disk"
+msgstr ""
+
+#: appinfo/app.php:6
+msgid "Files"
+msgstr "ගොනු"
+
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
+msgid "Delete"
+msgstr ""
+
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:192 js/filelist.js:194
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:192 js/filelist.js:194
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:192
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:192 js/filelist.js:194
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:241 js/filelist.js:243
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:243
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:275
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted"
+msgstr ""
+
+#: js/files.js:179
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:214
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:214
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:242 js/files.js:347 js/files.js:377
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:262
+msgid "1 file uploading"
+msgstr ""
+
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "files uploading"
+msgstr ""
+
+#: js/files.js:328 js/files.js:361
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:430
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:500
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:681
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:689
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:762 templates/index.php:48
+msgid "Name"
+msgstr "නම"
+
+#: js/files.js:763 templates/index.php:56
+msgid "Size"
+msgstr "ප්‍රමාණය"
+
+#: js/files.js:764 templates/index.php:58
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:791
+msgid "folder"
+msgstr "ෆෝල්ඩරය"
+
+#: js/files.js:793
+msgid "folders"
+msgstr "ෆෝල්ඩර"
+
+#: js/files.js:801
+msgid "file"
+msgstr "ගොනුව"
+
+#: js/files.js:803
+msgid "files"
+msgstr "ගොනු"
+
+#: js/files.js:847
+msgid "seconds ago"
+msgstr ""
+
+#: js/files.js:848
+msgid "minute ago"
+msgstr ""
+
+#: js/files.js:849
+msgid "minutes ago"
+msgstr ""
+
+#: js/files.js:852
+msgid "today"
+msgstr ""
+
+#: js/files.js:853
+msgid "yesterday"
+msgstr ""
+
+#: js/files.js:854
+msgid "days ago"
+msgstr ""
+
+#: js/files.js:855
+msgid "last month"
+msgstr ""
+
+#: js/files.js:857
+msgid "months ago"
+msgstr ""
+
+#: js/files.js:858
+msgid "last year"
+msgstr ""
+
+#: js/files.js:859
+msgid "years ago"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr "උඩුගත කිරීමක උපරිම ප්‍රමාණය"
+
+#: templates/admin.php:7
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr "නව"
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Folder"
+msgstr "ෆෝල්ඩරය"
+
+#: templates/index.php:11
+msgid "From url"
+msgstr ""
+
+#: templates/index.php:20
+msgid "Upload"
+msgstr "උඩුගත කිරීම"
+
+#: templates/index.php:27
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Nothing in here. Upload something!"
+msgstr "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න"
+
+#: templates/index.php:50
+msgid "Share"
+msgstr ""
+
+#: templates/index.php:52
+msgid "Download"
+msgstr "බාගත කිරීම"
+
+#: templates/index.php:75
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:77
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:82
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:85
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/si_LK/files_encryption.po b/l10n/si_LK/files_encryption.po
new file mode 100644
index 0000000000..b321106d98
--- /dev/null
+++ b/l10n/si_LK/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-16 02:03+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: si_LK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
new file mode 100644
index 0000000000..3f565dbbd4
--- /dev/null
+++ b/l10n/si_LK/files_external.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-16 02:03+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: si_LK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:73 js/google.js:72
+msgid "Fill out all required fields"
+msgstr ""
+
+#: js/dropbox.js:85
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:26 js/google.js:73 js/google.js:78
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:107
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "Allow users to mount their own external storage"
+msgstr ""
+
+#: templates/settings.php:99
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:113
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
new file mode 100644
index 0000000000..fa03702776
--- /dev/null
+++ b/l10n/si_LK/files_sharing.po
@@ -0,0 +1,48 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-16 02:03+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: si_LK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
+
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:29
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:35
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/si_LK/files_versions.po b/l10n/si_LK/files_versions.po
new file mode 100644
index 0000000000..41165d9434
--- /dev/null
+++ b/l10n/si_LK/files_versions.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-16 02:03+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: si_LK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/settings-personal.js:31 templates/settings-personal.php:10
+msgid "Expire all versions"
+msgstr ""
+
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr ""
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
new file mode 100644
index 0000000000..bc62f158cf
--- /dev/null
+++ b/l10n/si_LK/lib.po
@@ -0,0 +1,125 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: si_LK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: app.php:285
+msgid "Help"
+msgstr ""
+
+#: app.php:292
+msgid "Personal"
+msgstr ""
+
+#: app.php:297
+msgid "Settings"
+msgstr ""
+
+#: app.php:302
+msgid "Users"
+msgstr ""
+
+#: app.php:309
+msgid "Apps"
+msgstr ""
+
+#: app.php:311
+msgid "Admin"
+msgstr ""
+
+#: files.php:328
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:329
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:329 files.php:354
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:353
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:64 json.php:77 json.php:89
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:87
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:88
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:89
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:92
+msgid "today"
+msgstr ""
+
+#: template.php:93
+msgid "yesterday"
+msgstr ""
+
+#: template.php:94
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:95
+msgid "last month"
+msgstr ""
+
+#: template.php:96
+msgid "months ago"
+msgstr ""
+
+#: template.php:97
+msgid "last year"
+msgstr ""
+
+#: template.php:98
+msgid "years ago"
+msgstr ""
+
+#: updater.php:75
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:77
+msgid "up to date"
+msgstr ""
+
+#: updater.php:80
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
new file mode 100644
index 0000000000..fa1e595106
--- /dev/null
+++ b/l10n/si_LK/settings.po
@@ -0,0 +1,321 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <thanojar@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-15 10:27+0000\n"
+"Last-Translator: Thanoja <thanojar@gmail.com>\n"
+"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: si_LK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/creategroup.php:12
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:21
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/openid.php:16
+msgid "OpenID Changed"
+msgstr ""
+
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
+msgid "Invalid request"
+msgstr "අවලංගු අයදුම"
+
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:18 ajax/setquota.php:18 ajax/togglegroups.php:15
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/removeuser.php:27
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:18
+msgid "Language changed"
+msgstr "භාෂාව ාවනස් කිරීම"
+
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: js/apps.js:28 js/apps.js:65
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:28 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:42 personal.php:43
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:17
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/admin.php:31
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
+
+#: templates/admin.php:49
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
+
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:61
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:62
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:67
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:68
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:73
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:74
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:79
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:81
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:88
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:116
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:124
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr ""
+
+#: templates/apps.php:10
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:11
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:27
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:32
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Documentation"
+msgstr ""
+
+#: templates/help.php:10
+msgid "Managing Big Files"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Ask a question"
+msgstr ""
+
+#: templates/help.php:23
+msgid "Problems connecting to help database."
+msgstr ""
+
+#: templates/help.php:24
+msgid "Go there manually."
+msgstr ""
+
+#: templates/help.php:32
+msgid "Answer"
+msgstr "පිළිතුර"
+
+#: templates/personal.php:8
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
+
+#: templates/personal.php:12
+msgid "Desktop and Mobile Syncing Clients"
+msgstr ""
+
+#: templates/personal.php:13
+msgid "Download"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:20
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:21
+msgid "Current password"
+msgstr "නූතන මුරපදය"
+
+#: templates/personal.php:22
+msgid "New password"
+msgstr "නව මුරපදය"
+
+#: templates/personal.php:23
+msgid "show"
+msgstr "ප්‍රදර්ශනය කිරීම"
+
+#: templates/personal.php:24
+msgid "Change password"
+msgstr "මුරපදය වෙනස් කිරීම"
+
+#: templates/personal.php:30
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:31
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:32
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:38 templates/personal.php:39
+msgid "Language"
+msgstr "භාෂාව"
+
+#: templates/personal.php:44
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:51
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:21 templates/users.php:76
+msgid "Name"
+msgstr "නාමය"
+
+#: templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "මුරපදය"
+
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
+msgid "Groups"
+msgstr "සමූහය"
+
+#: templates/users.php:32
+msgid "Create"
+msgstr "තනනවා"
+
+#: templates/users.php:35
+msgid "Default Quota"
+msgstr ""
+
+#: templates/users.php:55 templates/users.php:138
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:80 templates/users.php:112
+msgid "Group Admin"
+msgstr ""
+
+#: templates/users.php:82
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:146
+msgid "Delete"
+msgstr "මකා දමනවා"
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
new file mode 100644
index 0000000000..8279ec5bca
--- /dev/null
+++ b/l10n/si_LK/user_ldap.po
@@ -0,0 +1,170 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-16 02:03+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: si_LK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Help"
+msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 8566a8adc5..b362f1c0f4 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -149,7 +149,8 @@ msgstr "Zdieľať cez odkaz"
 msgid "Password protect"
 msgstr "Chrániť heslom"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Heslo"
 
@@ -241,8 +242,8 @@ msgstr "Požiadané"
 msgid "Login failed!"
 msgstr "Prihlásenie zlyhalo!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Prihlasovacie meno"
 
@@ -302,7 +303,7 @@ msgstr "Úprava kategórií"
 msgid "Add"
 msgstr "Pridať"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -318,48 +319,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Vytvoriť <strong>administrátorský účet</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Priečinok dát"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Nastaviť databázu"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "bude použité"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Hostiteľ databázy"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Heslo databázy"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Meno databázy"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Server databázy"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Dokončiť inštaláciu"
 
@@ -371,15 +381,29 @@ msgstr "webové služby pod vašou kontrolou"
 msgid "Log out"
 msgstr "Odhlásiť"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Zabudli ste heslo?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "zapamätať"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Prihlásiť sa"
 
@@ -394,3 +418,17 @@ msgstr "späť"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "ďalej"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 2ea6a60677..1a771160cf 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -149,7 +149,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Geslo"
 
@@ -241,8 +242,8 @@ msgstr "Zahtevano"
 msgid "Login failed!"
 msgstr "Prijava je spodletela!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Uporabniško Ime"
 
@@ -302,7 +303,7 @@ msgstr "Uredi kategorije"
 msgid "Add"
 msgstr "Dodaj"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -318,48 +319,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Ustvari <strong>skrbniški račun</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Napredne možnosti"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Mapa s podatki"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Nastavi podatkovno zbirko"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "bo uporabljen"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Uporabnik zbirke"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Geslo podatkovne zbirke"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Ime podatkovne zbirke"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Razpredelnica podatkovne zbirke"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Gostitelj podatkovne zbirke"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Dokončaj namestitev"
 
@@ -371,15 +381,29 @@ msgstr "spletne storitve pod vašim nadzorom"
 msgid "Log out"
 msgstr "Odjava"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Ste pozabili vaše geslo?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "Zapomni si me"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Prijava"
 
@@ -394,3 +418,17 @@ msgstr "nazaj"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "naprej"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/so/core.po b/l10n/so/core.po
index c7734f3d3b..b7723cd082 100644
--- a/l10n/so/core.po
+++ b/l10n/so/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -146,7 +146,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr ""
 
@@ -238,8 +239,8 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr ""
 
@@ -299,7 +300,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -315,48 +316,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr ""
 
@@ -368,15 +378,29 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr ""
 
@@ -391,3 +415,17 @@ msgstr ""
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr ""
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 8ae8078ba4..79b292785c 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -147,7 +147,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Лозинка"
 
@@ -239,8 +240,8 @@ msgstr "Захтевано"
 msgid "Login failed!"
 msgstr "Несупела пријава!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Корисничко име"
 
@@ -300,7 +301,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -316,48 +317,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Направи <strong>административни налог</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Напредно"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Фацикла података"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Подешавање базе"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "ће бити коришћен"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Корисник базе"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Лозинка базе"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Име базе"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Домаћин базе"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Заврши подешавање"
 
@@ -369,15 +379,29 @@ msgstr "веб сервиси под контролом"
 msgid "Log out"
 msgstr "Одјава"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Изгубили сте лозинку?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "упамти"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Пријава"
 
@@ -392,3 +416,17 @@ msgstr "претходно"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "следеће"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 35fc115d82..760ce1d331 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -147,7 +147,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Lozinka"
 
@@ -239,8 +240,8 @@ msgstr "Zahtevano"
 msgid "Login failed!"
 msgstr "Nesupela prijava!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Korisničko ime"
 
@@ -300,7 +301,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -316,48 +317,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Napravi <strong>administrativni nalog</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Napredno"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Facikla podataka"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Podešavanje baze"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "će biti korišćen"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Korisnik baze"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Lozinka baze"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Ime baze"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Domaćin baze"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Završi podešavanje"
 
@@ -369,15 +379,29 @@ msgstr ""
 msgid "Log out"
 msgstr "Odjava"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Izgubili ste lozinku?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "upamti"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr ""
 
@@ -392,3 +416,17 @@ msgstr "prethodno"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "sledeće"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index a2e4aea4a2..6c2844d645 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -152,7 +152,8 @@ msgstr "Delad med länk"
 msgid "Password protect"
 msgstr "Lösenordsskydda"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Lösenord"
 
@@ -244,8 +245,8 @@ msgstr "Begärd"
 msgid "Login failed!"
 msgstr "Misslyckad inloggning!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Användarnamn"
 
@@ -305,64 +306,73 @@ msgstr "Redigera kategorier"
 msgid "Add"
 msgstr "Lägg till"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
-msgstr ""
+msgstr "Säkerhetsvarning"
 
 #: templates/installation.php:24
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Ingen säker slumptalsgenerator finns tillgänglig. Du bör aktivera PHP OpenSSL-tillägget."
 
 #: templates/installation.php:26
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
+msgstr "Utan en säker slumptalsgenerator kan angripare få möjlighet att förutsäga lösenordsåterställningar och ta över ditt konto."
+
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Skapa ett <strong>administratörskonto</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Datamapp"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Konfigurera databasen"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "kommer att användas"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Databasanvändare"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Lösenord till databasen"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Databasnamn"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Databas tabellutrymme"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Databasserver"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Avsluta installation"
 
@@ -374,15 +384,29 @@ msgstr "webbtjänster under din kontroll"
 msgid "Log out"
 msgstr "Logga ut"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Glömt ditt lösenord?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "kom ihåg"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Logga in"
 
@@ -397,3 +421,17 @@ msgstr "föregående"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "nästa"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
new file mode 100644
index 0000000000..1686955bd9
--- /dev/null
+++ b/l10n/ta_LK/core.po
@@ -0,0 +1,431 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_LK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
+msgid "Application name not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:29
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:36
+msgid "This category already exists: "
+msgstr ""
+
+#: js/js.js:238 templates/layout.user.php:49 templates/layout.user.php:50
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:670
+msgid "January"
+msgstr ""
+
+#: js/js.js:670
+msgid "February"
+msgstr ""
+
+#: js/js.js:670
+msgid "March"
+msgstr ""
+
+#: js/js.js:670
+msgid "April"
+msgstr ""
+
+#: js/js.js:670
+msgid "May"
+msgstr ""
+
+#: js/js.js:670
+msgid "June"
+msgstr ""
+
+#: js/js.js:671
+msgid "July"
+msgstr ""
+
+#: js/js.js:671
+msgid "August"
+msgstr ""
+
+#: js/js.js:671
+msgid "September"
+msgstr ""
+
+#: js/js.js:671
+msgid "October"
+msgstr ""
+
+#: js/js.js:671
+msgid "November"
+msgstr ""
+
+#: js/js.js:671
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:497
+#: js/share.js:509
+msgid "Error"
+msgstr ""
+
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+msgid "Shared with you and the group"
+msgstr ""
+
+#: js/share.js:130
+msgid "by"
+msgstr ""
+
+#: js/share.js:132
+msgid "Shared with you by"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
+msgid "Password"
+msgstr ""
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:185
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:187
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:214
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:250
+msgid "Shared in"
+msgstr ""
+
+#: js/share.js:250
+msgid "with"
+msgstr ""
+
+#: js/share.js:271
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:283
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:285
+msgid "access control"
+msgstr ""
+
+#: js/share.js:288
+msgid "create"
+msgstr ""
+
+#: js/share.js:291
+msgid "update"
+msgstr ""
+
+#: js/share.js:294
+msgid "delete"
+msgstr ""
+
+#: js/share.js:297
+msgid "share"
+msgstr ""
+
+#: js/share.js:322 js/share.js:484
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:497
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:509
+msgid "Error setting expiration date"
+msgstr ""
+
+#: lostpassword/index.php:26
+msgid "ownCloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:14
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:23 templates/installation.php:31
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:24
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:26
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:48
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:50
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:57
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:105
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:113
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:121
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:127
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:38
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:27
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:28
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr ""
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr ""
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
new file mode 100644
index 0000000000..942737c0f6
--- /dev/null
+++ b/l10n/ta_LK/files.po
@@ -0,0 +1,299 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-16 02:03+0200\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_LK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/upload.php:20
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:21
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/upload.php:22
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:24
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:25
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:26
+msgid "Failed to write to disk"
+msgstr ""
+
+#: appinfo/app.php:6
+msgid "Files"
+msgstr ""
+
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
+msgid "Delete"
+msgstr ""
+
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:192 js/filelist.js:194
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:192 js/filelist.js:194
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:192
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:192 js/filelist.js:194
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:241 js/filelist.js:243
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:243
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:275
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted"
+msgstr ""
+
+#: js/files.js:179
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:214
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:214
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:242 js/files.js:347 js/files.js:377
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:262
+msgid "1 file uploading"
+msgstr ""
+
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "files uploading"
+msgstr ""
+
+#: js/files.js:328 js/files.js:361
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:430
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:500
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:681
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:689
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:762 templates/index.php:48
+msgid "Name"
+msgstr ""
+
+#: js/files.js:763 templates/index.php:56
+msgid "Size"
+msgstr ""
+
+#: js/files.js:764 templates/index.php:58
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:791
+msgid "folder"
+msgstr ""
+
+#: js/files.js:793
+msgid "folders"
+msgstr ""
+
+#: js/files.js:801
+msgid "file"
+msgstr ""
+
+#: js/files.js:803
+msgid "files"
+msgstr ""
+
+#: js/files.js:847
+msgid "seconds ago"
+msgstr ""
+
+#: js/files.js:848
+msgid "minute ago"
+msgstr ""
+
+#: js/files.js:849
+msgid "minutes ago"
+msgstr ""
+
+#: js/files.js:852
+msgid "today"
+msgstr ""
+
+#: js/files.js:853
+msgid "yesterday"
+msgstr ""
+
+#: js/files.js:854
+msgid "days ago"
+msgstr ""
+
+#: js/files.js:855
+msgid "last month"
+msgstr ""
+
+#: js/files.js:857
+msgid "months ago"
+msgstr ""
+
+#: js/files.js:858
+msgid "last year"
+msgstr ""
+
+#: js/files.js:859
+msgid "years ago"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:11
+msgid "From url"
+msgstr ""
+
+#: templates/index.php:20
+msgid "Upload"
+msgstr ""
+
+#: templates/index.php:27
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Share"
+msgstr ""
+
+#: templates/index.php:52
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:75
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:77
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:82
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:85
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/ta_LK/files_encryption.po b/l10n/ta_LK/files_encryption.po
new file mode 100644
index 0000000000..59c15d46d9
--- /dev/null
+++ b/l10n/ta_LK/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-16 02:03+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_LK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
new file mode 100644
index 0000000000..469c1e516e
--- /dev/null
+++ b/l10n/ta_LK/files_external.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-16 02:03+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_LK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:73 js/google.js:72
+msgid "Fill out all required fields"
+msgstr ""
+
+#: js/dropbox.js:85
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:26 js/google.js:73 js/google.js:78
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:107
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "Allow users to mount their own external storage"
+msgstr ""
+
+#: templates/settings.php:99
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:113
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
new file mode 100644
index 0000000000..b2ec47ff86
--- /dev/null
+++ b/l10n/ta_LK/files_sharing.po
@@ -0,0 +1,48 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-16 02:03+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_LK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
+
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:29
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:35
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/ta_LK/files_versions.po b/l10n/ta_LK/files_versions.po
new file mode 100644
index 0000000000..7fc3ff7a54
--- /dev/null
+++ b/l10n/ta_LK/files_versions.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-16 02:03+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_LK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/settings-personal.js:31 templates/settings-personal.php:10
+msgid "Expire all versions"
+msgstr ""
+
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr ""
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
new file mode 100644
index 0000000000..f55cc27487
--- /dev/null
+++ b/l10n/ta_LK/lib.po
@@ -0,0 +1,125 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_LK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: app.php:285
+msgid "Help"
+msgstr ""
+
+#: app.php:292
+msgid "Personal"
+msgstr ""
+
+#: app.php:297
+msgid "Settings"
+msgstr ""
+
+#: app.php:302
+msgid "Users"
+msgstr ""
+
+#: app.php:309
+msgid "Apps"
+msgstr ""
+
+#: app.php:311
+msgid "Admin"
+msgstr ""
+
+#: files.php:328
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:329
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:329 files.php:354
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:353
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:64 json.php:77 json.php:89
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:87
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:88
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:89
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:92
+msgid "today"
+msgstr ""
+
+#: template.php:93
+msgid "yesterday"
+msgstr ""
+
+#: template.php:94
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:95
+msgid "last month"
+msgstr ""
+
+#: template.php:96
+msgid "months ago"
+msgstr ""
+
+#: template.php:97
+msgid "last year"
+msgstr ""
+
+#: template.php:98
+msgid "years ago"
+msgstr ""
+
+#: updater.php:75
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:77
+msgid "up to date"
+msgstr ""
+
+#: updater.php:80
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
new file mode 100644
index 0000000000..934df12e9d
--- /dev/null
+++ b/l10n/ta_LK/settings.po
@@ -0,0 +1,320 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2011-07-25 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_LK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/creategroup.php:12
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:21
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/openid.php:16
+msgid "OpenID Changed"
+msgstr ""
+
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:18 ajax/setquota.php:18 ajax/togglegroups.php:15
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/removeuser.php:27
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:18
+msgid "Language changed"
+msgstr ""
+
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: js/apps.js:28 js/apps.js:65
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:28 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:42 personal.php:43
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:17
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/admin.php:31
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
+
+#: templates/admin.php:49
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
+
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:61
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:62
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:67
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:68
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:73
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:74
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:79
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:81
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:88
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:116
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:124
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr ""
+
+#: templates/apps.php:10
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:11
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:27
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:32
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Documentation"
+msgstr ""
+
+#: templates/help.php:10
+msgid "Managing Big Files"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Ask a question"
+msgstr ""
+
+#: templates/help.php:23
+msgid "Problems connecting to help database."
+msgstr ""
+
+#: templates/help.php:24
+msgid "Go there manually."
+msgstr ""
+
+#: templates/help.php:32
+msgid "Answer"
+msgstr ""
+
+#: templates/personal.php:8
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
+
+#: templates/personal.php:12
+msgid "Desktop and Mobile Syncing Clients"
+msgstr ""
+
+#: templates/personal.php:13
+msgid "Download"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:20
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:21
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:22
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:23
+msgid "show"
+msgstr ""
+
+#: templates/personal.php:24
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:30
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:31
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:32
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:38 templates/personal.php:39
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:44
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:51
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:21 templates/users.php:76
+msgid "Name"
+msgstr ""
+
+#: templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr ""
+
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
+msgid "Groups"
+msgstr ""
+
+#: templates/users.php:32
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:35
+msgid "Default Quota"
+msgstr ""
+
+#: templates/users.php:55 templates/users.php:138
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:80 templates/users.php:112
+msgid "Group Admin"
+msgstr ""
+
+#: templates/users.php:82
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:146
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
new file mode 100644
index 0000000000..878df1455d
--- /dev/null
+++ b/l10n/ta_LK/user_ldap.po
@@ -0,0 +1,170 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-16 02:03+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_LK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Help"
+msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index b12bec9a77..691c7cc63c 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-10-15 02:04+0200\n"
+"POT-Creation-Date: 2012-10-16 02:04+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"
@@ -146,7 +146,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr ""
 
@@ -238,8 +239,8 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr ""
 
@@ -299,7 +300,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -315,48 +316,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the "
+"webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr ""
 
@@ -368,15 +378,29 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr ""
 
@@ -391,3 +415,17 @@ msgstr ""
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr ""
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index e3f198351b..2be16caf0a 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-10-15 02:04+0200\n"
+"POT-Creation-Date: 2012-10-16 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 81653fc497..ef857a831d 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
+"POT-Creation-Date: 2012-10-16 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 943b147cf7..570055034c 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
+"POT-Creation-Date: 2012-10-16 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 9349caaa32..e01ebef68a 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
+"POT-Creation-Date: 2012-10-16 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 9d6c5cde27..7e12c35e75 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
+"POT-Creation-Date: 2012-10-16 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 831124a8aa..6a33055b64 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
+"POT-Creation-Date: 2012-10-16 02:04+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"
@@ -61,7 +61,7 @@ msgstr ""
 msgid "Application is not enabled"
 msgstr ""
 
-#: json.php:39 json.php:63 json.php:75
+#: json.php:39 json.php:64 json.php:77 json.php:89
 msgid "Authentication error"
 msgstr ""
 
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 6c422f4427..24b905ed9a 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-10-15 02:04+0200\n"
+"POT-Creation-Date: 2012-10-16 02:04+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"
@@ -21,16 +21,11 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/creategroup.php:9 ajax/removeuser.php:18 ajax/setquota.php:18
-#: ajax/togglegroups.php:15
-msgid "Authentication error"
-msgstr ""
-
-#: ajax/creategroup.php:19
+#: ajax/creategroup.php:12
 msgid "Group already exists"
 msgstr ""
 
-#: ajax/creategroup.php:28
+#: ajax/creategroup.php:21
 msgid "Unable to add group"
 msgstr ""
 
@@ -58,6 +53,10 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
+#: ajax/removeuser.php:18 ajax/setquota.php:18 ajax/togglegroups.php:15
+msgid "Authentication error"
+msgstr ""
+
 #: ajax/removeuser.php:27
 msgid "Unable to delete user"
 msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 5c27df10ae..ca917b5641 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
+"POT-Creation-Date: 2012-10-16 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 724c62ae75..7c76014283 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -148,7 +148,8 @@ msgstr "แชร์ด้วยลิงก์"
 msgid "Password protect"
 msgstr "ใส่รหัสผ่านไว้"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "รหัสผ่าน"
 
@@ -240,8 +241,8 @@ msgstr "ส่งคำร้องเรียบร้อยแล้ว"
 msgid "Login failed!"
 msgstr "ไม่สามารถเข้าสู่ระบบได้!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "ชื่อผู้ใช้งาน"
 
@@ -301,7 +302,7 @@ msgstr "แก้ไขหมวดหมู่"
 msgid "Add"
 msgstr "เพิ่ม"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -317,48 +318,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "ขั้นสูง"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "โฟลเดอร์เก็บข้อมูล"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "กำหนดค่าฐานข้อมูล"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "จะถูกใช้"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "ชื่อผู้ใช้งานฐานข้อมูล"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "รหัสผ่านฐานข้อมูล"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "ชื่อฐานข้อมูล"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "พื้นที่ตารางในฐานข้อมูล"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Database host"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "ติดตั้งเรียบร้อยแล้ว"
 
@@ -370,15 +380,29 @@ msgstr "web services under your control"
 msgid "Log out"
 msgstr "ออกจากระบบ"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "ลืมรหัสผ่าน?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "จำรหัสผ่าน"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "เข้าสู่ระบบ"
 
@@ -393,3 +417,17 @@ msgstr "ก่อนหน้า"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "ถัดไป"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index e9b8c39685..17d229d035 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -149,7 +149,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Parola"
 
@@ -241,8 +242,8 @@ msgstr "İstendi"
 msgid "Login failed!"
 msgstr "Giriş başarısız!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Kullanıcı adı"
 
@@ -302,7 +303,7 @@ msgstr "Kategorileri düzenle"
 msgid "Add"
 msgstr "Ekle"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -318,48 +319,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Bir <strong>yönetici hesabı</strong> oluşturun"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Veri klasörü"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Veritabanını ayarla"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "kullanılacak"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Veritabanı kullanıcı adı"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Veritabanı parolası"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Veritabanı adı"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "Veritabanı tablo alanı"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Veritabanı sunucusu"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Kurulumu tamamla"
 
@@ -371,15 +381,29 @@ msgstr "kontrolünüzdeki web servisleri"
 msgid "Log out"
 msgstr "Çıkış yap"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Parolanızı mı unuttunuz?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "hatırla"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Giriş yap"
 
@@ -394,3 +418,17 @@ msgstr "önceki"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "sonraki"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 5fd0d8dfb1..8657d0895c 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -149,7 +149,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Пароль"
 
@@ -241,8 +242,8 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Ім'я користувача"
 
@@ -302,7 +303,7 @@ msgstr ""
 msgid "Add"
 msgstr "Додати"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -318,48 +319,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Налаштування бази даних"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "буде використано"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Користувач бази даних"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Пароль для бази даних"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Назва бази даних"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Завершити налаштування"
 
@@ -371,15 +381,29 @@ msgstr "веб-сервіс під вашим контролем"
 msgid "Log out"
 msgstr "Вихід"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Забули пароль?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "запам'ятати"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Вхід"
 
@@ -394,3 +418,17 @@ msgstr ""
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr ""
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 132f026b98..83429ba958 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -147,7 +147,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "Mật khẩu"
 
@@ -239,8 +240,8 @@ msgstr "Yêu cầu"
 msgid "Login failed!"
 msgstr "Bạn đã nhập sai mật khẩu hay tên người dùng !"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "Tên người dùng"
 
@@ -300,7 +301,7 @@ msgstr "Sửa thể loại"
 msgid "Add"
 msgstr "Thêm"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -316,48 +317,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "Tạo một <strong>tài khoản quản trị</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "Nâng cao"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "Thư mục dữ liệu"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "Cấu hình Cơ Sở Dữ Liệu"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "được sử dụng"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "Người dùng cơ sở dữ liệu"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "Mật khẩu cơ sở dữ liệu"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "Tên cơ sở dữ liệu"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "Database host"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "Cài đặt hoàn tất"
 
@@ -369,15 +379,29 @@ msgstr "các dịch vụ web dưới sự kiểm soát của bạn"
 msgid "Log out"
 msgstr "Đăng xuất"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "Bạn quên mật khẩu ?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "Nhớ"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "Đăng nhập"
 
@@ -392,3 +416,17 @@ msgstr "Lùi lại"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "Kế tiếp"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 68632f1690..ce748b4f8c 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -148,7 +148,8 @@ msgstr "分享链接"
 msgid "Password protect"
 msgstr "密码保护"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "密码"
 
@@ -240,8 +241,8 @@ msgstr "请求"
 msgid "Login failed!"
 msgstr "登陆失败!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "用户名"
 
@@ -301,7 +302,7 @@ msgstr "编辑分类"
 msgid "Add"
 msgstr "添加"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -317,48 +318,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "建立一个 <strong>管理帐户</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "进阶"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "数据存放文件夹"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "配置数据库"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "将会使用"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "数据库用户"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "数据库密码"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "数据库用户名"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "数据库表格空间"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "数据库主机"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "完成安装"
 
@@ -370,15 +380,29 @@ msgstr "你控制下的网络服务"
 msgid "Log out"
 msgstr "注销"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "忘记密码?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "备忘"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "登陆"
 
@@ -393,3 +417,17 @@ msgstr "后退"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "前进"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 1802288e32..bab36633e1 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -150,7 +150,8 @@ msgstr "共享链接"
 msgid "Password protect"
 msgstr "密码保护"
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "密码"
 
@@ -242,8 +243,8 @@ msgstr "已请求"
 msgid "Login failed!"
 msgstr "登录失败！"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "用户名"
 
@@ -303,7 +304,7 @@ msgstr "编辑分类"
 msgid "Add"
 msgstr "添加"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -319,48 +320,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "创建<strong>管理员账号</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "高级"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "数据目录"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "配置数据库"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "将被使用"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "数据库用户"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "数据库密码"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "数据库名"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "数据库表空间"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "数据库主机"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "安装完成"
 
@@ -372,15 +382,29 @@ msgstr "由您掌控的网络服务"
 msgid "Log out"
 msgstr "注销"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "忘记密码？"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "记住"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "登录"
 
@@ -395,3 +419,17 @@ msgstr "上一页"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "下一页"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 73eab0d57c..9bb44a04f1 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-15 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 00:05+0000\n"
+"POT-Creation-Date: 2012-10-16 02:04+0200\n"
+"PO-Revision-Date: 2012-10-16 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -148,7 +148,8 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:36 templates/login.php:13
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
 msgid "Password"
 msgstr "密碼"
 
@@ -240,8 +241,8 @@ msgstr "已要求"
 msgid "Login failed!"
 msgstr "登入失敗!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:32
-#: templates/login.php:9
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
 msgid "Username"
 msgstr "使用者名稱"
 
@@ -301,7 +302,7 @@ msgstr "編輯分類"
 msgid "Add"
 msgstr "添加"
 
-#: templates/installation.php:23
+#: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
 msgstr ""
 
@@ -317,48 +318,57 @@ msgid ""
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:30
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
 msgstr "建立一個<strong>管理者帳號</strong>"
 
-#: templates/installation.php:42
+#: templates/installation.php:48
 msgid "Advanced"
 msgstr "進階"
 
-#: templates/installation.php:44
+#: templates/installation.php:50
 msgid "Data folder"
 msgstr "資料夾"
 
-#: templates/installation.php:51
+#: templates/installation.php:57
 msgid "Configure the database"
 msgstr "設定資料庫"
 
-#: templates/installation.php:56 templates/installation.php:67
-#: templates/installation.php:77 templates/installation.php:87
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
 msgid "will be used"
 msgstr "將會使用"
 
-#: templates/installation.php:99
+#: templates/installation.php:105
 msgid "Database user"
 msgstr "資料庫使用者"
 
-#: templates/installation.php:103
+#: templates/installation.php:109
 msgid "Database password"
 msgstr "資料庫密碼"
 
-#: templates/installation.php:107
+#: templates/installation.php:113
 msgid "Database name"
 msgstr "資料庫名稱"
 
-#: templates/installation.php:115
+#: templates/installation.php:121
 msgid "Database tablespace"
 msgstr "資料庫 tablespace"
 
-#: templates/installation.php:121
+#: templates/installation.php:127
 msgid "Database host"
 msgstr "資料庫主機"
 
-#: templates/installation.php:126
+#: templates/installation.php:132
 msgid "Finish setup"
 msgstr "完成設定"
 
@@ -370,15 +380,29 @@ msgstr "網路服務已在你控制"
 msgid "Log out"
 msgstr "登出"
 
-#: templates/login.php:6
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
 msgid "Lost your password?"
 msgstr "忘記密碼?"
 
-#: templates/login.php:16
+#: templates/login.php:27
 msgid "remember"
 msgstr "記住"
 
-#: templates/login.php:17
+#: templates/login.php:28
 msgid "Log in"
 msgstr "登入"
 
@@ -393,3 +417,17 @@ msgstr "上一頁"
 #: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "下一頁"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr ""
diff --git a/lib/base.php b/lib/base.php
index 9f21e26279..803d3e8bde 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -264,8 +264,30 @@ class OC{
 	}
 
 	public static function initSession() {
+		// prevents javascript from accessing php session cookies
 		ini_set('session.cookie_httponly', '1;');
+
+		// (re)-initialize session
 		session_start();
+		
+		// regenerate session id periodically to avoid session fixation
+		if (!isset($_SESSION['SID_CREATED'])) {
+			$_SESSION['SID_CREATED'] = time();
+		} else if (time() - $_SESSION['SID_CREATED'] > 900) {
+			session_regenerate_id(true);
+			$_SESSION['SID_CREATED'] = time();
+		}
+
+		// session timeout
+		if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > 3600)) {
+			if (isset($_COOKIE[session_name()])) {
+				setcookie(session_name(), '', time() - 42000, '/');
+			}
+			session_unset();
+			session_destroy();
+			session_start();
+		}
+		$_SESSION['LAST_ACTIVITY'] = time();
 	}
 
 	public static function init() {
@@ -323,6 +345,10 @@ class OC{
 
 		self::initPaths();
 
+		register_shutdown_function(array('OC_Log', 'onShutdown'));
+		set_error_handler(array('OC_Log', 'onError'));
+		set_exception_handler(array('OC_Log', 'onException'));
+
 		// set debug mode if an xdebug session is active
 		if (!defined('DEBUG') || !DEBUG) {
 			if(isset($_COOKIE['XDEBUG_SESSION'])) {
@@ -449,6 +475,7 @@ class OC{
 			OC_App::loadApps();
 			OC_User::setupBackends();
 			if(isset($_GET["logout"]) and ($_GET["logout"])) {
+				OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']);
 				OC_User::logout();
 				header("Location: ".OC::$WEBROOT.'/');
 			}else{
@@ -510,6 +537,17 @@ class OC{
 		OC_Util::displayLoginPage(array_unique($error));
 	}
 
+	protected static function cleanupLoginTokens($user) {
+		$cutoff = time() - OC_Config::getValue('remember_login_cookie_lifetime', 60*60*24*15);
+		$tokens = OC_Preferences::getKeys($user, 'login_token');
+		foreach($tokens as $token) {
+			$time = OC_Preferences::getValue($user, 'login_token', $token);
+			if ($time < $cutoff) {
+				OC_Preferences::deleteKey($user, 'login_token', $token);
+			}
+		}
+	}
+
 	protected static function tryRememberLogin() {
 		if(!isset($_COOKIE["oc_remember_login"])
 			|| !isset($_COOKIE["oc_token"])
@@ -523,15 +561,30 @@ class OC{
 			OC_Log::write('core', 'Trying to login from cookie', OC_Log::DEBUG);
 		}
 		// confirm credentials in cookie
-		if(isset($_COOKIE['oc_token']) && OC_User::userExists($_COOKIE['oc_username']) &&
-			OC_Preferences::getValue($_COOKIE['oc_username'], "login", "token") === $_COOKIE['oc_token'])
-		{
-			OC_User::setUserId($_COOKIE['oc_username']);
-			OC_Util::redirectToDefaultPage();
-		}
-		else {
-			OC_User::unsetMagicInCookie();
+		if(isset($_COOKIE['oc_token']) && OC_User::userExists($_COOKIE['oc_username'])) {
+			// delete outdated cookies
+			self::cleanupLoginTokens($_COOKIE['oc_username']);
+			// get stored tokens
+			$tokens = OC_Preferences::getKeys($_COOKIE['oc_username'], 'login_token');
+			// test cookies token against stored tokens
+			if (in_array($_COOKIE['oc_token'], $tokens, true)) {
+				// replace successfully used token with a new one
+				OC_Preferences::deleteKey($_COOKIE['oc_username'], 'login_token', $_COOKIE['oc_token']);
+				$token = OC_Util::generate_random_bytes(32);
+				OC_Preferences::setValue($_COOKIE['oc_username'], 'login_token', $token, time());
+				OC_User::setMagicInCookie($_COOKIE['oc_username'], $token);
+				// login
+				OC_User::setUserId($_COOKIE['oc_username']);
+				OC_Util::redirectToDefaultPage();
+				// doesn't return
+			}
+			// if you reach this point you have changed your password 
+			// or you are an attacker
+			// we can not delete tokens here because users may reach 
+			// this point multiple times after a password change
+			OC_Log::write('core', 'Authentication cookie rejected for user '.$_COOKIE['oc_username'], OC_Log::WARN);
 		}
+		OC_User::unsetMagicInCookie();
 		return true;
 	}
 
@@ -546,12 +599,13 @@ class OC{
 		OC_User::setupBackends();
 
 		if(OC_User::login($_POST["user"], $_POST["password"])) {
+			self::cleanupLoginTokens($_POST['user']);
 			if(!empty($_POST["remember_login"])) {
 				if(defined("DEBUG") && DEBUG) {
 					OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG);
 				}
-				$token = md5($_POST["user"].time().$_POST['password']);
-				OC_Preferences::setValue($_POST['user'], 'login', 'token', $token);
+				$token = OC_Util::generate_random_bytes(32);
+				OC_Preferences::setValue($_POST['user'], 'login_token', $token, time());
 				OC_User::setMagicInCookie($_POST["user"], $token);
 			}
 			else {
diff --git a/lib/json.php b/lib/json.php
index c362c66693..cc50490726 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -80,17 +80,18 @@ class OC_JSON{
 	}
 
 	/**
-	* Check if the user verified the login with his password in the last 15 minutes
-	* @return bool
+	* Check if the user verified the login with his password
 	*/
 	public static function verifyUser() {
-		// Check if the user verified his password in the last 15 minutes
-		if($_SESSION['verifiedLogin'] < time() OR !isset($_SESSION['verifiedLogin'])) {
-			self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
-			exit();
+		if(OC_Config::getValue('enhancedauth', true) === true) {
+			if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) {
+				$l = OC_L10N::get('lib');
+				self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+				exit();
+			}
 		}
 	}
-
+	
 	/**
 	* Send json error msg
 	*/
diff --git a/lib/log.php b/lib/log.php
index 6de99b4ea6..4bba62cf4b 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -39,4 +39,26 @@ class OC_Log {
 			$log_class::write($app, $message, $level);
 		}
 	}
+	
+	//Fatal errors handler
+	public static function onShutdown(){
+		$error = error_get_last();
+		if($error) {
+			//ob_end_clean();
+			self::write('PHP', $error['message'] . ' at ' . $error['file'] . '#' . $error['line'], self::FATAL);
+		} else {
+			return true; 
+		}
+	}
+	
+	// Uncaught exception handler
+	public static function onException($exception){
+		self::write('PHP', $exception->getMessage() . ' at ' . $exception->getFile() . '#' . $exception->getLine(), self::FATAL);
+	}
+
+	//Recoverable errors handler
+	public static function onError($number, $message, $file, $line){
+		self::write('PHP', $message . ' at ' . $file . '#' . $line, self::WARN);
+
+	}
 }
diff --git a/lib/setup.php b/lib/setup.php
index be4101fd7b..3c92e9c559 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -6,6 +6,10 @@ $hasPostgreSQL = is_callable('pg_connect');
 $hasOracle = is_callable('oci_connect');
 $datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data');
 
+// Test if  .htaccess is working
+$content = "deny from all";
+file_put_contents(OC::$SERVERROOT.'/data/.htaccess', $content);
+
 $opts = array(
 	'hasSQLite' => $hasSQLite,
 	'hasMySQL' => $hasMySQL,
@@ -13,6 +17,7 @@ $opts = array(
 	'hasOracle' => $hasOracle,
 	'directory' => $datadir,
 	'secureRNG' => OC_Util::secureRNG_available(),
+	'htaccessWorking' => OC_Util::ishtaccessworking(),
 	'errors' => array(),
 );
 
@@ -385,7 +390,7 @@ class OC_Setup {
 				if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
 					self::createHtaccess();
 				}
-
+				
 				//and we are done
 				OC_Config::setValue('installed', true);
 			}
diff --git a/lib/user.php b/lib/user.php
index 7de2a4b7fe..e577002650 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -329,6 +329,8 @@ class OC_User {
 					}
 				}
 			}
+			// invalidate all login cookies
+			OC_Preferences::deleteApp($uid, 'login_token');
 			OC_Hook::emit( "OC_User", "post_setPassword", array( "uid" => $uid, "password" => $password ));
 			return $success;
 		}
@@ -472,9 +474,10 @@ class OC_User {
 	 */
 	public static function setMagicInCookie($username, $token) {
 		$secure_cookie = OC_Config::getValue("forcessl", false);
-		setcookie("oc_username", $username, time()+60*60*24*15, '', '', $secure_cookie);
-		setcookie("oc_token", $token, time()+60*60*24*15, '', '', $secure_cookie);
-		setcookie("oc_remember_login", true, time()+60*60*24*15, '', '', $secure_cookie);
+		$expires = time() + OC_Config::getValue('remember_login_cookie_lifetime', 60*60*24*15);
+		setcookie("oc_username", $username, $expires, '', '', $secure_cookie);
+		setcookie("oc_token", $token, $expires, '', '', $secure_cookie, true);
+		setcookie("oc_remember_login", true, $expires, '', '', $secure_cookie);
 	}
 
 	/**
diff --git a/lib/util.php b/lib/util.php
index c6b164adbe..5771b89f26 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -391,20 +391,35 @@ class OC_Util {
 	* If not, the user will be shown a password verification page
 	*/
 	public static function verifyUser() {
-		// Check password to set session
-		if(isset($_POST['password'])) {
-			if (OC_User::login(OC_User::getUser(), $_POST["password"] ) === true) {
-				$_SESSION['verifiedLogin']=time() + (15 * 60);
+		if(OC_Config::getValue('enhancedauth', true) === true) {
+					// Check password to set session
+			if(isset($_POST['password'])) {
+				if (OC_User::login(OC_User::getUser(), $_POST["password"] ) === true) {
+					$_SESSION['verifiedLogin']=time() + OC_Config::getValue('enhancedauthtime', 15 * 60);
+				}
 			}
-		}
 
-		// Check if the user verified his password in the last 15 minutes
-		if($_SESSION['verifiedLogin'] < time() OR !isset($_SESSION['verifiedLogin'])) {
-			OC_Template::printGuestPage("", "verify",  array('username' => OC_User::getUser()));
-			exit();
+		// Check if the user verified his password
+			if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) {
+				OC_Template::printGuestPage("", "verify",  array('username' => OC_User::getUser()));
+				exit();
+			}
 		}
 	}
 
+	/**
+	* Check if the user verified the login with his password
+	* @return bool
+	*/
+	public static function isUserVerified() {
+		if(OC_Config::getValue('enhancedauth', true) === true) {
+			if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) {
+				return false;
+			}
+			return true;
+		}
+	}
+	
 	/**
 	* Redirect to the user default page
 	*/
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 5d94497ce5..12d3b67037 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -6,10 +6,10 @@ require_once '../../lib/base.php';
 // Check if we are a user
 OCP\JSON::callCheck();
 OC_JSON::checkLoggedIn();
-OC_JSON::verifyUser();
 
 $username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
 $password = $_POST["password"];
+$oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
 
 $userstatus = null;
 if(OC_Group::inGroup(OC_User::getUser(), 'admin')) {
@@ -18,8 +18,15 @@ if(OC_Group::inGroup(OC_User::getUser(), 'admin')) {
 if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
 	$userstatus = 'subadmin';
 }
-if(OC_User::getUser() == $username) {
-	$userstatus = 'user';
+if(OC_User::getUser() === $username) {
+	if (OC_User::checkPassword($username, $oldPassword))
+	{
+		$userstatus = 'user';
+	}  else {
+		if (!OC_Util::isUserVerified()) {
+			$userstatus = null;
+		}
+	}
 }
 
 if(is_null($userstatus)) {
@@ -27,6 +34,10 @@ if(is_null($userstatus)) {
 	exit();
 }
 
+if($userstatus === 'admin' || $userstatus === 'subadmin') {
+	OC_JSON::verifyUser();
+}
+
 // Return Success story
 if( OC_User::setPassword( $username, $password )) {
 	OC_JSON::success(array("data" => array( "username" => $username )));
diff --git a/settings/ajax/lostpassword.php b/settings/ajax/lostpassword.php
index af1a35fda4..2a40ba09a8 100644
--- a/settings/ajax/lostpassword.php
+++ b/settings/ajax/lostpassword.php
@@ -4,7 +4,6 @@
 require_once '../../lib/base.php';
 OC_JSON::checkLoggedIn();
 OCP\JSON::callCheck();
-OC_JSON::verifyUser();
 
 $l=OC_L10N::get('core');
 
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index b81f545b13..3a7bf0749b 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Impossible de charger la liste depuis l'App Store",
-"Authentication error" => "Erreur d'authentification",
 "Group already exists" => "Ce groupe existe déjà",
 "Unable to add group" => "Impossible d'ajouter le groupe",
 "Could not enable app. " => "Impossible d'activer l'Application",
@@ -9,6 +8,7 @@
 "OpenID Changed" => "Identifiant OpenID changé",
 "Invalid request" => "Requête invalide",
 "Unable to delete group" => "Impossible de supprimer le groupe",
+"Authentication error" => "Erreur d'authentification",
 "Unable to delete user" => "Impossible de supprimer l'utilisateur",
 "Language changed" => "Langue changée",
 "Unable to add user to group %s" => "Impossible d'ajouter l'utilisateur au groupe %s",
@@ -36,6 +36,7 @@
 "More" => "Plus",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Ajoutez votre application",
+"More Apps" => "Plus d'applications…",
 "Select an App" => "Sélectionner une Application",
 "See application page at apps.owncloud.com" => "Voir la page des applications à l'url apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Distribué sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 38e9dfda65..81b7861a3b 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "アプリストアからリストをロードできません",
-"Authentication error" => "認証エラー",
 "Group already exists" => "グループは既に存在しています",
 "Unable to add group" => "グループを追加できません",
 "Could not enable app. " => "アプリを有効にできませんでした。",
@@ -9,6 +8,7 @@
 "OpenID Changed" => "OpenIDが変更されました",
 "Invalid request" => "無効なリクエストです",
 "Unable to delete group" => "グループを削除できません",
+"Authentication error" => "認証エラー",
 "Unable to delete user" => "ユーザを削除できません",
 "Language changed" => "言語が変更されました",
 "Unable to add user to group %s" => "ユーザをグループ %s に追加できません",
@@ -46,7 +46,7 @@
 "Problems connecting to help database." => "ヘルプデータベースへの接続時に問題が発生しました",
 "Go there manually." => "手動で移動してください。",
 "Answer" => "解答",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "現在､<strong>%s</strong> / <strong>%s<strong> を利用しています",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "現在､ <strong>%s</strong> / <strong>%s<strong> を利用しています",
 "Desktop and Mobile Syncing Clients" => "デスクトップおよびモバイル用の同期クライアント",
 "Download" => "ダウンロード",
 "Your password was changed" => "パスワードを変更しました",
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
new file mode 100644
index 0000000000..451fb8a985
--- /dev/null
+++ b/settings/l10n/si_LK.php
@@ -0,0 +1,15 @@
+<?php $TRANSLATIONS = array(
+"Invalid request" => "අවලංගු අයදුම",
+"Language changed" => "භාෂාව ාවනස් කිරීම",
+"Answer" => "පිළිතුර",
+"Current password" => "නූතන මුරපදය",
+"New password" => "නව මුරපදය",
+"show" => "ප්‍රදර්ශනය කිරීම",
+"Change password" => "මුරපදය වෙනස් කිරීම",
+"Language" => "භාෂාව",
+"Name" => "නාමය",
+"Password" => "මුරපදය",
+"Groups" => "සමූහය",
+"Create" => "තනනවා",
+"Delete" => "මකා දමනවා"
+);
diff --git a/settings/personal.php b/settings/personal.php
index 3348b3290f..2031edd8df 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -7,7 +7,6 @@
 
 require_once '../lib/base.php';
 OC_Util::checkLoggedIn();
-OC_Util::verifyUser();
 
 // Highlight navigation entry
 OC_Util::addScript( 'settings', 'personal' );
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 0683bd3b64..55ff24b422 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -18,8 +18,9 @@
 	<fieldset class="personalblock">
 		<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
 		<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
-		<input type="password" id="pass1" name="password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#show" />
-		<input type="password" id="pass2" name="password" placeholder="<?php echo $l->t('Verify password');?>" data-typetoggle="#show" />
+		<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" />
+		<input type="password" id="pass2" name="password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#show" />
+		<input type="checkbox" id="show" name="show" /><label for="show"><?php echo $l->t('show');?></label>
 		<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
 	</fieldset>
 </form>