From 15741132b4a2b6f006441f4c11e021062c168af8 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Mon, 23 Nov 2009 16:18:13 +0100
Subject: Some language changes in subscription management

Ignore-this: 9d6c368419814c7b8cb94f778377ede7

A few language strings were dropped, others updated or added

darcs-hash:20091123151813-6e07b-4d01fe03fa2c3bd5944bc05abdd05a24fb79c186.gz
---
 inc/lang/en/lang.php        | 24 +++++++++++-------------
 inc/lang/en/subscr_form.txt |  4 ++--
 2 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'inc/lang')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 728d7823b..e4d050648 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -215,21 +215,19 @@ $lang['subscr_subscribe_error']    = 'Error adding %s to subscription list for %
 $lang['subscr_subscribe_noaddress']= 'There is no address associated with your login, you cannot be added to the subscription list';
 $lang['subscr_unsubscribe_success']= 'Removed %s from subscription list for %s';
 $lang['subscr_unsubscribe_error']  = 'Error removing %s from subscription list for %s';
-$lang['subscr_no_target'] = 'No subscription target';
-$lang['subscr_invalid_style'] = 'Invalid subscription style';
-$lang['subscr_invalid_action'] = 'Invalid subscription action';
 $lang['subscr_already_subscribed'] = '%s is already subscribed to %s';
-$lang['subscr_not_subscribed'] = '%s is not subscribed to %s';
-$lang['subscr_not_subscribed_you'] = 'You are not subscribed to %s';
+$lang['subscr_not_subscribed']     = '%s is not subscribed to %s';
 // Manage page for subscriptions
-$lang['subscr_m_current_header'] = 'Current subscriptions';
-$lang['subscr_m_current'] = 'Your current subscriptions:';
-$lang['subscr_m_entry'] = 'Subscribed to %s receiving %s.';
-$lang['subscr_m_delete'] = 'Delete';
-$lang['subscr_m_not_subscribed'] = 'You are currently not subscribed to this page.';
-$lang['subscr_m_new_header'] = 'Add subscription';
-$lang['subscr_m_noemail'] =  'You did not set an email address.';
-$lang['subscr_m_subscribe'] = 'Subscribe';
+$lang['subscr_m_not_subscribed']   = 'You are currently not subscribed to the current page or namespace.';
+$lang['subscr_m_new_header']       = 'Add subscription';
+$lang['subscr_m_current_header']   = 'Current subscriptions';
+$lang['subscr_m_unsubscribe']      = 'Unsubscribe';
+$lang['subscr_m_subscribe']        = 'Subscribe';
+
+$lang['subscr_style_every']        = 'email on every change';
+$lang['subscr_style_digest']       = 'digest email of changes for each page';
+$lang['subscr_style_list']         = 'list of changes since last email';
+
 
 /* auth.class language support */
 $lang['authmodfailed']   = 'Bad user authentication configuration. Please inform your Wiki Admin.';
diff --git a/inc/lang/en/subscr_form.txt b/inc/lang/en/subscr_form.txt
index 94b75258c..d606508c6 100644
--- a/inc/lang/en/subscr_form.txt
+++ b/inc/lang/en/subscr_form.txt
@@ -1,3 +1,3 @@
-====== Manage subscriptions ======
+====== Subscription Management ======
 
-This form allows you to manage your subscriptions for the current page.
+This page allows you to manage your subscriptions for the current page and namespace.
-- 
cgit v1.2.3