better wording in admin area

1 files changed, 40 insertions, 30 deletions

diff --git a/templates/admin.php b/templates/admin.php
index 7c9836c94..c1aa99b6f 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -6,69 +6,79 @@ style('news', 'admin');
 <div class="section" id="news">
     <h2>News</h2>
     <div class="form-line">
-        <input type="checkbox" name="news-use-cron-updates"
+        <p><input type="checkbox" name="news-use-cron-updates"
                <?php if ($_['useCronUpdates']) p('checked'); ?>>
-        <label for="news-use-cron-updates">
-            <?php p($l->t('Use ownCloud cron to for updates')); ?></label>
+            <label for="news-use-cron-updates">
+                <?php p($l->t('Use ownCloud cron to for updates')); ?>
+            </label>
+        </p>
         <p>
             <em><?php p($l->t(
                 'Disable this if you run a custom updater such as the Python ' .
-                'updater included in the app.'
+                'updater included in the app'
             )); ?></em>
         </p>
     </div>
     <div class="form-line">
-        <input type="text" name="news-auto-purge-minimum-interval"
-               value="<?php p($_['autoPurgeMinimumInterval']); ?>">
-        <label for="news-auto-purge-minimum-interval">
-            <?php p($l->t('Purge interval')); ?>
-        </label>
+        <p>
+            <label for="news-auto-purge-minimum-interval">
+                <?php p($l->t('Purge interval')); ?></p>
+            </label>
         <p>
             <em>
             <?php p($l->t(
                 'Minimum amount of seconds after deleted feeds and folders are ' .
-                'removed from the database. Values below 60 seconds are ignored'
+                'removed from the database; values below 60 seconds are ignored'
             )); ?></em>
         </p>
+        <p><input type="text" name="news-auto-purge-minimum-interval"
+               value="<?php p($_['autoPurgeMinimumInterval']); ?>"></p>
     </div>
     <div class="form-line">
-        <input type="text" name="news-auto-purge-count"
-               value="<?php p($_['autoPurgeCount']); ?>">
-        <label for="news-auto-purge-count">
-            <?php p($l->t('Maximum unread count per feed')); ?>
-        </label>
+        <p>
+            <label for="news-auto-purge-count">
+                <?php p($l->t('Maximum read count per feed')); ?>
+            </label>
+        </p>
         <p>
             <em>
             <?php p($l->t(
-                'Defines the minimum amount of articles that can be unread per ' .
-                'feed before they get deleted.'
+                'Defines the maximum amount of articles that can be read per ' .
+                "feed which won't be deleted by the cleanup job; ".
+                'if old articles reappear after being read, increase ' .
+                'this value'
             )); ?></em>
         </p>
+        <p><input type="text" name="news-auto-purge-count"
+               value="<?php p($_['autoPurgeCount']); ?>"></p>
     </div>
     <div class="form-line">
-        <input type="text" name="news-cache-duration"
-               value="<?php p($_['cacheDuration']); ?>">
-        <label for="news-cache-duration">
-            <?php p($l->t('Cache duration')); ?>
-        </label>
         <p>
-            <em><?php p($l->t('Amount of seconds to cache feeds')); ?></em>
+            <label for="news-cache-duration">
+                <?php p($l->t('Cache duration')); ?>
+            </label>
         </p>
+        <p>
+            <em><?php p($l->t('How many seconds a feed should be cached')); ?></em>
+        </p>
+        <p><input type="text" name="news-cache-duration"
+               value="<?php p($_['cacheDuration']); ?>"></p>
     </div>
     <div class="form-line">
-        <input type="text" name="news-feed-fetcher-timeout"
-               value="<?php p($_['feedFetcherTimeout']); ?>">
-        <label for="news-feed-fetcher-timeout">
-            <?php p($l->t('Feed fetcher timeout')); ?>
-        </label>
+        <p>
+            <label for="news-feed-fetcher-timeout">
+                <?php p($l->t('Feed fetcher timeout')); ?>
+            </label>
+        </p>
         <p>
             <em>
             <?php p($l->t(
                 'Maximum number of seconds to wait for an RSS or Atom feed to ' .
-                'load. If a feed takes longer than that number of seconds to ' .
-                'update, the update will be aborted.'
+                'load; if it takes longer the update will be aborted.'
             )); ?></em>
         </p>
+        <p><input type="text" name="news-feed-fetcher-timeout"
+               value="<?php p($_['feedFetcherTimeout']); ?>"></p>
     </div>
     <div id="news-saved-message">
         <span class="msg success"><?php p($l->t('Saved')); ?></span>