[php-blog-cvs] r2354 - in trunk: . docs include include/tpl lang lang/UTF-8
A reliable, secure & extensible PHP blog | Not mainstream since 2002
Brought to you by:
garvinhicking,
jhermanns
Menu
▾
▴
[php-blog-cvs] r2354 - in trunk: . docs include include/tpl lang lang/UTF-8
|
From: garvinhicking at B. <gar...@ma...> - 2008-10-18 11:17:56
|
Author: garvinhicking
Date: 2008-10-18 13:17:40 +0200 (Sat, 18 Oct 2008)
New Revision: 2354
Modified:
trunk/comment.php
trunk/docs/NEWS
trunk/include/functions.inc.php
trunk/include/functions_comments.inc.php
trunk/include/functions_installer.inc.php
trunk/include/tpl/config_local.inc.php
trunk/lang/UTF-8/plugin_lang.php
trunk/lang/UTF-8/serendipity_lang_bg.inc.php
trunk/lang/UTF-8/serendipity_lang_cn.inc.php
trunk/lang/UTF-8/serendipity_lang_cs.inc.php
trunk/lang/UTF-8/serendipity_lang_cz.inc.php
trunk/lang/UTF-8/serendipity_lang_da.inc.php
trunk/lang/UTF-8/serendipity_lang_de.inc.php
trunk/lang/UTF-8/serendipity_lang_en.inc.php
trunk/lang/UTF-8/serendipity_lang_es.inc.php
trunk/lang/UTF-8/serendipity_lang_fa.inc.php
trunk/lang/UTF-8/serendipity_lang_fi.inc.php
trunk/lang/UTF-8/serendipity_lang_fr.inc.php
trunk/lang/UTF-8/serendipity_lang_hu.inc.php
trunk/lang/UTF-8/serendipity_lang_is.inc.php
trunk/lang/UTF-8/serendipity_lang_it.inc.php
trunk/lang/UTF-8/serendipity_lang_ja.inc.php
trunk/lang/UTF-8/serendipity_lang_ko.inc.php
trunk/lang/UTF-8/serendipity_lang_nl.inc.php
trunk/lang/UTF-8/serendipity_lang_no.inc.php
trunk/lang/UTF-8/serendipity_lang_pl.inc.php
trunk/lang/UTF-8/serendipity_lang_pt.inc.php
trunk/lang/UTF-8/serendipity_lang_pt_PT.inc.php
trunk/lang/UTF-8/serendipity_lang_ro.inc.php
trunk/lang/UTF-8/serendipity_lang_ru.inc.php
trunk/lang/UTF-8/serendipity_lang_sa.inc.php
trunk/lang/UTF-8/serendipity_lang_se.inc.php
trunk/lang/UTF-8/serendipity_lang_ta.inc.php
trunk/lang/UTF-8/serendipity_lang_tn.inc.php
trunk/lang/UTF-8/serendipity_lang_tr.inc.php
trunk/lang/UTF-8/serendipity_lang_tw.inc.php
trunk/lang/UTF-8/serendipity_lang_zh.inc.php
trunk/lang/addlang.txt
trunk/lang/plugin_lang.php
trunk/lang/serendipity_lang_bg.inc.php
trunk/lang/serendipity_lang_cn.inc.php
trunk/lang/serendipity_lang_cs.inc.php
trunk/lang/serendipity_lang_cz.inc.php
trunk/lang/serendipity_lang_da.inc.php
trunk/lang/serendipity_lang_de.inc.php
trunk/lang/serendipity_lang_en.inc.php
trunk/lang/serendipity_lang_es.inc.php
trunk/lang/serendipity_lang_fa.inc.php
trunk/lang/serendipity_lang_fi.inc.php
trunk/lang/serendipity_lang_fr.inc.php
trunk/lang/serendipity_lang_hu.inc.php
trunk/lang/serendipity_lang_is.inc.php
trunk/lang/serendipity_lang_it.inc.php
trunk/lang/serendipity_lang_ja.inc.php
trunk/lang/serendipity_lang_ko.inc.php
trunk/lang/serendipity_lang_nl.inc.php
trunk/lang/serendipity_lang_no.inc.php
trunk/lang/serendipity_lang_pl.inc.php
trunk/lang/serendipity_lang_pt.inc.php
trunk/lang/serendipity_lang_pt_PT.inc.php
trunk/lang/serendipity_lang_ro.inc.php
trunk/lang/serendipity_lang_ru.inc.php
trunk/lang/serendipity_lang_sa.inc.php
trunk/lang/serendipity_lang_se.inc.php
trunk/lang/serendipity_lang_ta.inc.php
trunk/lang/serendipity_lang_tn.inc.php
trunk/lang/serendipity_lang_tr.inc.php
trunk/lang/serendipity_lang_tw.inc.php
trunk/lang/serendipity_lang_zh.inc.php
Log:
Support Opt-In for comment subscription mails
Modified: trunk/comment.php
===================================================================
--- trunk/comment.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/comment.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -24,6 +24,10 @@
serendipity_confirmMail($_REQUEST['c'], $_REQUEST['hash']);
}
+if (!empty($_REQUEST['optin'])) {
+ serendipity_commentSubscriptionConfirm($_REQUEST['optin']);
+}
+
serendipity_rememberComment();
// Trackback logging. For developers: can be switched to true!
Modified: trunk/docs/NEWS
===================================================================
--- trunk/docs/NEWS 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/docs/NEWS 2008-10-18 11:17:40 UTC (rev 2354)
@@ -3,6 +3,9 @@
Version 1.4 ()
------------------------------------------------------------------------
+ * Add new global config option to support OptIn confirmation for
+ comment subscriptions (garvinhicking)
+
* Allow spamblock plugin to use approval mechanism for comments,
so that commenting users first need to approve their comment
via email ("once" or "always" as options).
Modified: trunk/include/functions.inc.php
===================================================================
--- trunk/include/functions.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/include/functions.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -533,6 +533,11 @@
}
}
+ if ($serendipity['dumpMail']) {
+ $fp = fopen($serendipity['serendipityPath'] . '/templates_c/mail.log', 'a');
+ fwrite($fp, date('Y-m-d H:i') . "\n" . print_r($maildata, true));
+ fclose($fp);
+ }
return mail($maildata['to'], $maildata['subject'], $maildata['message'], implode("\n", $maildata['headers']));
}
Modified: trunk/include/functions_comments.inc.php
===================================================================
--- trunk/include/functions_comments.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/include/functions_comments.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -756,7 +756,6 @@
AND e.authorid = a.authorid";
if (!serendipity_db_bool($serendipity['showFutureEntries'])) {
$query .= " AND e.timestamp <= " . serendipity_db_time();
-
}
$row = serendipity_db_query($query, true); // Get info on author/entry
@@ -765,8 +764,14 @@
return false;
}
+ $send_optin = false;
if (isset($commentInfo['subscribe'])) {
- $subscribe = 'true';
+ if (!isset($serendipity['allowSubscriptionsOptIn']) || $serendipity['allowSubscriptionsOptIn']) {
+ $subscribe = 'false';
+ $send_optin = true;
+ } else {
+ $subscribe = 'true';
+ }
} else {
$subscribe = 'false';
}
@@ -831,10 +836,74 @@
serendipity_sendMail($email, $subject, $message, $serendipity['blogMail']);
}
+ if ($send_optin) {
+ $dupe_check = serendipity_db_query("SELECT count(entry_id) AS counter
+ FROM {$serendipity['dbPrefix']}comments
+ WHERE entry_id = " . (int)$id . "
+ AND email = '$email'
+ AND subscribed = 'true'", true);
+ if (!is_array($dupe_check) || $dupe_check['counter'] < 1) {
+ serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}options (okey, name, value)
+ VALUES ('commentsub_{$dbhash}', '" . time() . "', '{$cid}')");
+
+ $subject = sprintf(NEW_COMMENT_TO_SUBSCRIBED_ENTRY, $row['title']);
+ $message = sprintf(CONFIRMATION_MAIL_SUBSCRIPTION,
+ $name,
+ $row['title'],
+ serendipity_archiveURL($id, $row['title'], 'baseURL'),
+ $serendipity['baseURL'] . 'comment.php?optin=' . $dbhash);
+
+ serendipity_sendMail($email, $subject, $message, $serendipity['blogMail']);
+ }
+ }
+
serendipity_purgeEntry($id, $t);
}
/**
+ * Confirm a comment subscription
+ *
+ * @access public
+ * @param string The confirmation hash
+ * @return boolean
+ */
+function serendipity_commentSubscriptionConfirm($hash) {
+ global $serendipity;
+
+ // Delete possible current cookie. Also delete any confirmation hashs that smell like 3-week-old, dead fish.
+ if (stristr($serendipity['dbType'], 'sqlite')) {
+ $cast = "name";
+ } else {
+ // Adds explicits casting for mysql, postgresql and others.
+ $cast = "cast(name as integer)";
+ }
+
+ serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}options
+ WHERE okey LIKE 'commentsub_%' AND $cast < " . (time() - 1814400) . ")");
+
+
+ $hashinfo = serendipity_db_query("SELECT value
+ FROM {$serendipity['dbPrefix']}options
+ WHERE okey = 'commentsub_" . serendipity_db_escape_string($hash) . "'", true);
+ if (is_array($hashinfo) && $hashinfo['value'] > 0) {
+ $cid = (int)$hashinfo['value'];
+ serendipity_db_query("UPDATE {$serendipity['dbPrefix']}comments
+ SET subscribed = 'true'
+ WHERE id = $cid");
+
+ $q = "SELECT c.entry_id, e.title, e.timestamp, e.id
+ FROM {$serendipity['dbPrefix']}comments AS c
+ JOIN {$serendipity['dbPrefix']}entries AS e
+ ON (e.id = c.entry_id)
+ WHERE c.id = " . $cid;
+ $confirm = serendipity_db_query($q, true);
+ $link = serendipity_getPermalink($confirm);
+ header('Location: ' . $serendipity['baseURL'] . $link);
+ exit;
+ }
+}
+
+/**
* Save a comment made by a visitor
*
* @access public
@@ -855,6 +924,8 @@
serendipity_plugin_api::hook_event('frontend_saveComment', $ca, $commentInfo);
if (!is_array($ca) || serendipity_db_bool($ca['allow_comments'])) {
serendipity_insertComment($id, $commentInfo, $type, $source, $ca);
+ $commentInfo['comment_id'] = $id;
+ serendipity_plugin_api::hook_event('frontend_saveComment_finish', $ca, $commentInfo);
return true;
} else {
return false;
Modified: trunk/include/functions_installer.inc.php
===================================================================
--- trunk/include/functions_installer.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/include/functions_installer.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -386,6 +386,10 @@
switch ($type) {
case 'bool':
$value = serendipity_get_bool($value);
+ if ($value === null) {
+ $value = $default;
+ }
+
echo '<input class="input_radio" id="radio_cfg_' . $name . '_yes" type="radio" name="' . $name . '" value="true" ';
echo (($value == true) ? 'checked="checked"' : ''). ' /><label for="radio_cfg_' . $name . '_yes"> ' . YES . '</label> ';
echo '<input class="input_radio" id="radio_cfg_' . $name . '_no" type="radio" name="' . $name . '" value="false" ';
Modified: trunk/include/tpl/config_local.inc.php
===================================================================
--- trunk/include/tpl/config_local.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/include/tpl/config_local.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -349,6 +349,13 @@
'default' => array('true' => YES, 'false' => NO, 'fulltext' => FULL_COMMENT_TEXT),
'permission' => 'siteConfiguration'),
+ array('var' => 'allowSubscriptionsOptIn',
+ 'title' => INSTALL_SUBSCRIBE_OPTIN,
+ 'description' => INSTALL_SUBSCRIBE_OPTIN_DESC,
+ 'type' => 'bool',
+ 'default' => true,
+ 'permission' => 'siteConfiguration'),
+
array('var' => 'useCommentTokens',
'title' => COMMENT_TOKENS,
'description' => COMMENT_TOKENS_DESC,
Modified: trunk/lang/UTF-8/plugin_lang.php
===================================================================
--- trunk/lang/UTF-8/plugin_lang.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/plugin_lang.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -110,3 +110,9 @@
@define('COMMENT_NOTOKENMATCH', 'Moderation link has expired or comment #%s has already been approved or deleted');
@define('TRACKBACK_NOTOKENMATCH', 'Moderation link has expired or trackback #%s has already been approved or deleted');
@define('BADTOKEN', 'Invalid Moderation Link');
+
+@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
+@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_bg.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_bg.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_bg.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -916,3 +916,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_cn.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_cn.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_cn.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_cn.inc.php 2294 2008-07-10 10:32:08Z garvinhicking $
+<?php # $Id: serendipity_lang_cn.inc.php 2353 2008-10-18 10:27:41Z garvinhicking $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details
# Translated by
@@ -927,3 +927,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_cs.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_cs.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_cs.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_cs.inc.php 2294 2008-07-10 10:32:08Z garvinhicking $
+<?php # $Id: serendipity_lang_cs.inc.php 2353 2008-10-18 10:27:41Z garvinhicking $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details
# Translation (c) 2004 Josef Klimosz <ok...@ce...>
@@ -935,3 +935,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_cz.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_cz.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_cz.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_cz.inc.php 2294 2008-07-10 10:32:08Z garvinhicking $
+<?php # $Id: serendipity_lang_cz.inc.php 2353 2008-10-18 10:27:41Z garvinhicking $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details
# Translation (c) 2004 Josef Klimosz <ok...@ce...>
@@ -935,3 +935,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_da.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_da.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_da.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_da.inc.php 2294 2008-07-10 10:32:08Z garvinhicking $
+<?php # $Id: serendipity_lang_da.inc.php 2353 2008-10-18 10:27:41Z garvinhicking $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details
# Translation (c) by Tom Sommer, <ts...@dr...>
@@ -924,3 +924,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_de.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_de.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_de.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -923,3 +923,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hallo %s,\n\nSie haben einen neuen Kommentar zu \"%s\" erstellt. Ihr Kommentar war:\n\n%s\n\nDer Betreiber dieses Blogs hat die Bestätigung per E-Mail gewünscht, daher müssen Sie folgenden Link anklicken:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hallo %s,\n\nSie haben einen neuen Kommentar zu \"%s\" erstellt. Ihr Kommentar war:\n\n%s\n\nDer Betreiber dieses Blogs hat die Bestätigung per E-Mail gewünscht, daher müssen Sie folgenden Link anklicken:\n<%s>\n\nNachdem Sie dies getan haben, können Sie auf dem Blog jederzeit mit ihrem Namen und E-Mail-Adresse ohne weitere Freischaltung kommentieren.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Benutze Double-Opt In für Abonnements von Kommentarbenachrichtigungen?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'Falls aktiviert, wird einem Kommentator, der E-Mail-Benachrichtigung zu neuen Kommentaren abonnieren möchte, eine E-Mail geschickt. Diese enthält einen Bestätigungslink nach dem z.B. für Deutsche Gesetze erforderlichen Opt-In-Schema.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hallo %s,\n\nSie haben bei ihrem Blog-Kommentar zu dem Eintrag \"%s\" auf <%s> das Abonnement neuer Kommentare gewünscht. Um dies zu bestätigen (\"Double Opt In\") klicken Sie bitte diesen Link:\n<%s>\n");
Modified: trunk/lang/UTF-8/serendipity_lang_en.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_en.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_en.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -923,3 +923,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_es.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_es.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_es.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_es.inc.php 2294 2008-07-10 10:32:08Z garvinhicking $
+<?php # $Id: serendipity_lang_es.inc.php 2353 2008-10-18 10:27:41Z garvinhicking $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details
# Translation (c) by Luis Cervantes <Lui...@on...>,
@@ -943,3 +943,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_fa.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_fa.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_fa.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_fa.inc.php 2294 2008-07-10 10:32:08Z garvinhicking $
+<?php # $Id: serendipity_lang_fa.inc.php 2353 2008-10-18 10:27:41Z garvinhicking $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details
# this translation, translated by Omid Mottaghi <http://oxygenws.com>
@@ -927,3 +927,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_fi.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_fi.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_fi.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_fi.inc.php 2294 2008-07-10 10:32:08Z garvinhicking $
+<?php # $Id: serendipity_lang_fi.inc.php 2353 2008-10-18 10:27:41Z garvinhicking $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details
# Translation by Mauri Sahlberg <mo...@ik...>
@@ -925,3 +925,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_fr.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_fr.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_fr.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_fr.inc.php 2294 2008-07-10 10:32:08Z garvinhicking $
+<?php # $Id: serendipity_lang_fr.inc.php 2353 2008-10-18 10:27:41Z garvinhicking $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details
# Translation by Sebastian Mordziol <ar...@ph...>
@@ -932,3 +932,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_hu.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_hu.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_hu.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -923,3 +923,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_is.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_is.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_is.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_is.inc.php 2294 2008-07-10 10:32:08Z garvinhicking $
+<?php # $Id: serendipity_lang_is.inc.php 2353 2008-10-18 10:27:41Z garvinhicking $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details
# Translation by Örn Arnarson <or...@ar...>
@@ -926,3 +926,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_it.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_it.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_it.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -929,3 +929,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_ja.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_ja.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_ja.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_ja.inc.php 2294 2008-07-10 10:32:08Z garvinhicking $
+<?php # $Id: serendipity_lang_ja.inc.php 2353 2008-10-18 10:27:41Z garvinhicking $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details
# Translation (c) Tadashi Jokagi <el...@us...>, 2004-2005.
@@ -929,3 +929,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_ko.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_ko.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_ko.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_ko.inc.php 2294 2008-07-10 10:32:08Z garvinhicking $
+<?php # $Id: serendipity_lang_ko.inc.php 2353 2008-10-18 10:27:41Z garvinhicking $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details
# Translated by: Wesley Hwang-Chung <wes...@gm...>
@@ -928,3 +928,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_nl.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_nl.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_nl.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_nl.inc.php 2294 2008-07-10 10:32:08Z garvinhicking $
+<?php # $Id: serendipity_lang_nl.inc.php 2353 2008-10-18 10:27:41Z garvinhicking $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details
# Translation (c) by Christiaan Heerze <web...@he...>
@@ -927,3 +927,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_no.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_no.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_no.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_no.inc.php 2294 2008-07-10 10:32:08Z garvinhicking $
+<?php # $Id: serendipity_lang_no.inc.php 2353 2008-10-18 10:27:41Z garvinhicking $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details
# Translation (c) by Jo Christian Oterhals <ote...@gm...>
@@ -928,3 +928,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_pl.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_pl.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_pl.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -924,3 +924,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_pt.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_pt.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_pt.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_pt.inc.php 2294 2008-07-10 10:32:08Z garvinhicking $
+<?php # $Id: serendipity_lang_pt.inc.php 2353 2008-10-18 10:27:41Z garvinhicking $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details
# Translation (c) by Agner Olson <ag...@ag...>
@@ -930,3 +930,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_pt_PT.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_pt_PT.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_pt_PT.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -937,3 +937,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_ro.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_ro.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_ro.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -926,3 +926,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_ru.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_ru.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_ru.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_ru.inc.php 2294 2008-07-10 10:32:08Z garvinhicking $
+<?php # $Id: serendipity_lang_ru.inc.php 2353 2008-10-18 10:27:41Z garvinhicking $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details
# Translation by Nightly <ni...@re...>
@@ -929,3 +929,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_sa.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_sa.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_sa.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -844,3 +844,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_se.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_se.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_se.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -925,3 +925,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_ta.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_ta.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_ta.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -925,3 +925,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail address without receiving such notifications.");
+@define('INSTALL_SUBSCRIBE_OPTIN', 'Use Double-Opt In for comment subscriptions?');
+@define('INSTALL_SUBSCRIBE_OPTIN_DESC', 'If enabled, when a comment is made where the person wants to be notified via e-mail about new comments to the same entry, he must confirm his subscription to the entry. This Double-Opt In is required by german law, for example.');
+@define('CONFIRMATION_MAIL_SUBSCRIPTION', "Hello %s,\n\nYou have requested to be notified for comments to \"%s\" (<%s>). To approve this subscription (\"Double Opt In\") please click this link:\n<%s>\n.");
Modified: trunk/lang/UTF-8/serendipity_lang_tn.inc.php
===================================================================
--- trunk/lang/UTF-8/serendipity_lang_tn.inc.php 2008-10-18 10:27:41 UTC (rev 2353)
+++ trunk/lang/UTF-8/serendipity_lang_tn.inc.php 2008-10-18 11:17:40 UTC (rev 2354)
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_tn.inc.php 2294 2008-07-10 10:32:08Z garvinhicking $
+<?php # $Id: serendipity_lang_tn.inc.php 2353 2008-10-18 10:27:41Z garvinhicking $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details
# Translated by CapriSkye <ad...@ca...>
@@ -929,3 +929,6 @@
@define('CONFIRMATION_MAIL_ALWAYS', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n");
@define('CONFIRMATION_MAIL_ONCE', "Hello %s,\n\nYou have sent a new comment to \"%s\". Your comment was:\n\n%s\n\nThe owner of the blog has enabled one-time mail verification, so you need to click on the following link to authenticate your comment:\n<%s>\n\nAfter you have done that, you can always post comments on that blog with your username and e-mail addre...
[truncated message content] |