Changeset 1604 for branches/multiuser

Show
Ignore:
Timestamp:
10/16/06 06:31:35 (2 years ago)
Author:
mdodoo
Message:

Sync with trunk up to (but not including changeset [1585]). I should *definitely* do this more often, because this was really annoying.

Location:
branches/multiuser
Files:
54 added
53 modified

Legend:

Unmodified
Added
Removed

  • branches/multiuser/admin/channels.php

    r1595 r1604  
    3737 
    3838function channels() { 
    39     echo "<h2>". LBL_ADMIN_CHANNELS ."</h2>\n"; 
     39    echo "<h2>". __('Feeds:') ."</h2>\n"; 
    4040    echo "<div id=\"admin_channels\">\n"; 
    4141    echo "<form method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."\">\n"; 
    4242    echo "<p><input type=\"hidden\" name=\"". CST_ADMIN_DOMAIN."\" value=\"".CST_ADMIN_DOMAIN_CHANNEL."\" />\n"; 
    43     echo "<label for=\"new_channel\">". LBL_ADMIN_CHANNELS_ADD ."</label>\n"; 
     43    echo "<label for=\"new_channel\">". __('Add a feed:') ."</label>\n"; 
    4444    echo "<input type=\"text\" name=\"new_channel\" id=\"new_channel\" value=\"http://\" onmouseover=\"clearOnHover(this);\" onfocus=\"this.select()\" />\n"; 
    4545 
    46     echo "<label for=\"add_channel_to_folder\">". LBL_ADMIN_IN_FOLDER . "</label>\n"; 
     46    echo "<label for=\"add_channel_to_folder\">". __('to folder:') . "</label>\n"; 
    4747    echo rss_toolkit_folders_combo('add_channel_to_folder'); 
    48     echo "<label for=\"channel_tags\">" . LBL_TAG_FOLDERS . ":</label>\n"; 
     48    echo "<label for=\"channel_tags\">" . __('Categories') . ":</label>\n"; 
    4949    echo "<input type=\"text\" name=\"channel_tags\" id=\"channel_tags\" />\n"; 
    50     echo "<input type=\"hidden\" name=\"". CST_ADMIN_METAACTION ."\" value=\"LBL_ADMIN_ADD\" />\n"; 
    51     echo "<input type=\"submit\" name=\"action\" value=\"". LBL_ADMIN_ADD ."\" /></p>\n"; 
    52     echo "<p style=\"font-size:small\">".LBL_ADMIN_ADD_CHANNEL_EXPL."</p>"; 
     50    echo "<input type=\"hidden\" name=\"". CST_ADMIN_METAACTION ."\" value=\"ACT_ADMIN_ADD\" />\n"; 
     51    echo "<input type=\"submit\" name=\"action\" value=\"". __('Add') ."\" /></p>\n"; 
     52    echo "<p style=\"font-size:small\">".__('(Enter either the URL of an RSS feed or of a Website whose feed you wish to subscribe to)')."</p>"; 
    5353    echo "</form>\n\n"; 
    5454 
    … …  
    6060                   ."('$b_url'.concat(escape(document.location).replace(/\s/,'%2520'))))"; 
    6161 
    62     echo "<p style=\"font-size:small\">" . LBL_ADMIN_BOOKMARKET_LABEL . " <a class=\"bookmarklet\" href=\"$bookmarklet\">".LBL_ADMIN_BOOKMARKLET_TITLE."</a></p>\n"; 
     62    echo "<p style=\"font-size:small\">" . __('Subscription bookmarklet [<a href="http://www.squarefree.com/bookmarklets/">?</a>]:') . " <a class=\"bookmarklet\" href=\"$bookmarklet\">".__('Subscribe in Gregarius!')."</a></p>\n"; 
    6363 
    6464    // feeds 
    … …  
    8383    ."<tr>\n" 
    8484    ."\t<th><input type=\"checkbox\" id=\"mastercb\" onclick=\"cbtoggle();\" /></th>\n" 
    85     ."\t<th>". LBL_ADMIN_CHANNELS_HEADING_TITLE ."</th>\n" 
    86     ."\t<th class=\"cntr\">". LBL_ADMIN_CHANNELS_HEADING_FOLDER ."</th>\n" 
    87     ."\t<th>". LBL_ADMIN_CHANNELS_HEADING_DESCR ."</th>\n" 
    88     ."\t<th>". LBL_TAG_FOLDERS."</th>\n" 
    89     ."\t<th>". LBL_ADMIN_CHANNELS_HEADING_FLAGS."</th>\n"; 
     85    ."\t<th>". __('Title') ."</th>\n" 
     86    ."\t<th class=\"cntr\">". __('Folder') ."</th>\n" 
     87    ."\t<th>". __('Description') ."</th>\n" 
     88    ."\t<th>". __('Categories')."</th>\n" 
     89    ."\t<th>". __('Flags')."</th>\n"; 
    9090 
    9191    if (getConfig('rss.config.absoluteordering')) { 
    92         echo "\t<th>".LBL_ADMIN_CHANNELS_HEADING_MOVE."</th>\n"; 
    93     } 
    94  
    95     echo "\t<th class=\"cntr\">". LBL_ADMIN_CHANNELS_HEADING_ACTION ."</th>\n" 
     92        echo "\t<th>".__('Move')."</th>\n"; 
     93    } 
     94 
     95    echo "\t<th class=\"cntr\">". __('Action') ."</th>\n" 
    9696    ."</tr>\n"; 
    9797 
    … …  
    118118        } 
    119119 
    120         $parentLabel = $parent == ''? LBL_HOME_FOLDER:$parent; 
     120        $parentLabel = $parent == ''? __('Root'):$parent; 
    121121 
    122122        $class_ = (($cntr++ % 2 == 0)?"even":"odd"); 
    … …  
    171171        if (getConfig('rss.config.absoluteordering')) { 
    172172            echo "\t<td class=\"cntr\"><a href=\"".$_SERVER['PHP_SELF']. "?".CST_ADMIN_DOMAIN."=". CST_ADMIN_DOMAIN_CHANNEL 
    173             ."&amp;action=". CST_ADMIN_MOVE_UP_ACTION. "&amp;cid=$id\">". LBL_ADMIN_MOVE_UP 
     173            ."&amp;action=". CST_ADMIN_MOVE_UP_ACTION. "&amp;cid=$id\">". __('&uarr;') 
    174174            ."</a>&nbsp;-&nbsp;<a href=\"".$_SERVER['PHP_SELF']. "?".CST_ADMIN_DOMAIN."=". CST_ADMIN_DOMAIN_CHANNEL 
    175             ."&amp;action=". CST_ADMIN_MOVE_DOWN_ACTION ."&amp;cid=$id\">".LBL_ADMIN_MOVE_DOWN ."</a></td>\n"; 
     175            ."&amp;action=". CST_ADMIN_MOVE_DOWN_ACTION ."&amp;cid=$id\">".__('&darr;') ."</a></td>\n"; 
    176176        } 
    177177        echo "\t<td class=\"cntr\"><a href=\"".$_SERVER['PHP_SELF']. "?".CST_ADMIN_DOMAIN."=". CST_ADMIN_DOMAIN_CHANNEL 
    178178        ."&amp;".CST_ADMIN_VIEW."=". CST_ADMIN_DOMAIN_CHANNEL 
    179         ."&amp;action=". CST_ADMIN_EDIT_ACTION. "&amp;cid=$id\">" . LBL_ADMIN_EDIT 
     179        ."&amp;action=". CST_ADMIN_EDIT_ACTION. "&amp;cid=$id\">" . __('edit') 
    180180        ."</a>|<a href=\"".$_SERVER['PHP_SELF']. "?".CST_ADMIN_DOMAIN."=". CST_ADMIN_DOMAIN_CHANNEL 
    181181        ."&amp;".CST_ADMIN_VIEW."=". CST_ADMIN_DOMAIN_CHANNEL 
    182         ."&amp;action=". CST_ADMIN_DELETE_ACTION ."&amp;cid=$id\">" . LBL_ADMIN_DELETE ."</a></td>\n" 
     182        ."&amp;action=". CST_ADMIN_DELETE_ACTION ."&amp;cid=$id\">" . __('delete') ."</a></td>\n" 
    183183        ."</tr>\n"; 
    184184    } 
    … …  
    189189    ."<legend>Selected...</legend>\n" 
    190190    ."<p>\n" 
    191     ."<label for=\"me_folder\">".LBL_ADMIN_CHANNEL_FOLDER."</label>\n" 
     191    ."<label for=\"me_folder\">".__('In folder:')."</label>\n" 
    192192    .rss_toolkit_folders_combo('me_folder',null); 
    193193 
    194194    echo 
    195     "<input type=\"submit\" id=\"me_move_to_folder\" name=\"me_move_to_folder\" value=\"".LBL_ADMIN_CHANNELS_HEADING_MOVE."\" />\n" 
     195    "<input type=\"submit\" id=\"me_move_to_folder\" name=\"me_move_to_folder\" value=\"".__('Move')."\" />\n" 
    196196 
    197197    ."<span class=\"vr\">&nbsp;</span>" 
    198198 
    199     ."<label>".LBL_ADMIN_STATE."</label>\n" 
     199    ."<label>".__('State:')."</label>\n" 
    200200    ."<input type=\"checkbox\" name=\"me_deprecated\" id=\"me_deprecated\" value=\"".RSS_MODE_DELETED_STATE."\" />\n" 
    201     ."<label for=\"me_deprecated\">".LBL_DEPRECATED."</label>\n" 
     201    ."<label for=\"me_deprecated\">".__('Deprecated')."</label>\n" 
    202202 
    203203    ."<input type=\"checkbox\" name=\"me_private\" id=\"me_private\" value=\"".RSS_MODE_PRIVATE_STATE."\" />\n" 
    204     ."<label for=\"me_private\">".LBL_PRIVATE."</label>\n" 
    205  
    206     ."<input type=\"submit\" id=\"me_state\" name=\"me_state\" value=\"".LBL_ADMIN_STATE_SET."\" />\n" 
     204    ."<label for=\"me_private\">".__('Private')."</label>\n" 
     205 
     206    ."<input type=\"submit\" id=\"me_state\" name=\"me_state\" value=\"".__('Set')."\" />\n" 
    207207 
    208208    ."<span class=\"vr\">&nbsp;</span>" 
    209209 
    210     ."<input type=\"submit\" id=\"me_delete\" name=\"me_delete\" value=\"".LBL_ADMIN_DELETE2."\" />\n" 
     210    ."<input type=\"submit\" id=\"me_delete\" name=\"me_delete\" value=\"".__('Delete')."\" />\n" 
    211211    ."<input type=\"checkbox\" name=\"me_do_delete\" id=\"me_do_delete\" value=\"1\" />\n" 
    212     ."<label for=\"me_do_delete\">".LBL_ADMIN_IM_SURE."</label>\n" 
     212    ."<label for=\"me_do_delete\">".__("I'm sure!")."</label>\n" 
    213213 
    214214 
    … …  
    249249    switch ($__action__) { 
    250250 
    251     case LBL_ADMIN_ADD: 
    252     case 'LBL_ADMIN_ADD': 
     251    case __('Add'): 
     252    case 'ACT_ADMIN_ADD': 
    253253    case 'Add': 
    254254 
    … …  
    279279                $newCid = $ret[0]; 
    280280                rss_error(sprintf( 
    281                               LBL_ADMIN_OPML_IMPORT_FEED_INFO, 
     281                              __('Adding %s to %s... '), 
    282282                              htmlentities($label),"/$flabel") 
    283                           . LBL_ADMIN_OK 
     283                          . __('OK') 
    284284                          . "&nbsp;[<a href=\"".getPath()."admin/index.php?domain=".CST_ADMIN_DOMAIN_CHANNEL 
    285285                          ."&amp;action=edit&amp;cid=$newCid\">" 
    286                           . LBL_ADMIN_EDIT 
     286                          . __('edit') 
    287287                          ."</a>]", 
    288288                          RSS_ERROR_ERROR,true); 
    … …  
    307307                            $newCid = $ret[0]; 
    308308                            rss_error(sprintf( 
    309                                           LBL_ADMIN_OPML_IMPORT_FEED_INFO, 
     309                                          __('Adding %s to %s... '), 
    310310                                          htmlentities($label),"/$flabel") 
    311                                       . LBL_ADMIN_OK 
     311                                      . __('OK') 
    312312                                      . "&nbsp;[<a href=\"".getPath()."admin/index.php?domain=" 
    313313                                      .CST_ADMIN_DOMAIN_CHANNEL 
    314314                                      ."&amp;action=edit&amp;cid=$newCid\">" 
    315                                       . LBL_ADMIN_EDIT 
     315                                      . __('edit') 
    316316                                      ."</a>]", 
    317317                                      RSS_ERROR_ERROR,true); 
    … …  
    327327                        // multiple feeds in the channel 
    328328                        echo "<form method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."\">\n" 
    329                         ."<p>".sprintf(LBL_ADMIN_FEEDS,$label,$label)."</p>\n"; 
     329                        ."<p>".sprintf(__('The following feeds were found in <a href="%s">%s</a>, which one would you like to subscribe?'),$label,$label)."</p>\n"; 
    330330                        $cnt = 0; 
    331331                        while(list($id,$feedarr) = each($feeds)) { 
    … …  
    366366                        echo "<p><input type=\"hidden\" name=\"add_channel_to_folder\" value=\"$fid\" />\n" 
    367367                        ."<input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"".CST_ADMIN_DOMAIN_CHANNEL."\" />\n" 
    368                         ."<input type=\"hidden\" name=\"".CST_ADMIN_METAACTION."\" value=\"LBL_ADMIN_ADD\" />\n" 
    369                         ."<input type=\"submit\" class=\"indent\" name=\"action\" value=\"". LBL_ADMIN_ADD ."\" />\n" 
     368                        ."<input type=\"hidden\" name=\"".CST_ADMIN_METAACTION."\" value=\"ACT_ADMIN_ADD\" />\n" 
     369                        ."<input type=\"submit\" class=\"indent\" name=\"action\" value=\"". __('Add') ."\" />\n" 
    370370                        ."</p>\n</form>\n\n"; 
    371371                    } 
    … …  
    377377            } 
    378378            else { 
    379                 rss_error(sprintf(LBL_ADMIN_BAD_RSS_URL,$label), RSS_ERROR_ERROR,true); 
     379                rss_error(sprintf(__("I'm sorry, I don't think I can handle this URL: '%s'"),$label), RSS_ERROR_ERROR,true); 
    380380                $ret__ = CST_ADMIN_DOMAIN_CHANNEL; 
    381381            } 
    382382        } else { 
    383             rss_error(sprintf(LBL_ADMIN_BAD_RSS_URL,$label), RSS_ERROR_ERROR,true); 
     383            rss_error(sprintf(__("I'm sorry, I don't think I can handle this URL: '%s'"),$label), RSS_ERROR_ERROR,true); 
    384384            $ret__ = CST_ADMIN_DOMAIN_CHANNEL; 
    385385        } 
    … …  
    394394    case CST_ADMIN_DELETE_ACTION: 
    395395        $id = sanitize($_REQUEST['cid'],RSS_SANITIZER_NUMERIC); 
    396         if (array_key_exists(CST_ADMIN_CONFIRMED,$_POST) && $_POST[CST_ADMIN_CONFIRMED] == LBL_ADMIN_YES) { 
     396        if (array_key_exists(CST_ADMIN_CONFIRMED,$_POST) && $_POST[CST_ADMIN_CONFIRMED] == __('Yes')) { 
    397397            $rs = rss_query("select distinct id from " .getTable("item") . " where cid=$id"); 
    398398            $ids = array(); 
    … …  
    419419            $ret__ = CST_ADMIN_DOMAIN_CHANNEL; 
    420420        } 
    421         elseif (array_key_exists(CST_ADMIN_CONFIRMED,$_REQUEST) && $_REQUEST[CST_ADMIN_CONFIRMED] == LBL_ADMIN_NO) { 
     421        elseif (array_key_exists(CST_ADMIN_CONFIRMED,$_REQUEST) && $_REQUEST[CST_ADMIN_CONFIRMED] == __('No')) { 
    422422            $ret__ = CST_ADMIN_DOMAIN_CHANNEL; 
    423423        } 
    … …  
    427427            echo "<form class=\"box\" method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."\">\n" 
    428428            ."<p class=\"error\">"; 
    429             printf(LBL_ADMIN_ARE_YOU_SURE,$cname); 
     429            printf(__("Are you sure you wish to delete '%s'?"),$cname); 
    430430            echo "</p>\n" 
    431             ."<p><input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". LBL_ADMIN_NO ."\" />\n" 
    432             ."<input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". LBL_ADMIN_YES ."\" />\n" 
     431            ."<p><input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". __('No') ."\" />\n" 
     432            ."<input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". __('Yes') ."\" />\n" 
    433433            ."<input type=\"hidden\" name=\"cid\" value=\"$id\" />\n" 
    434434            ."<input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"".CST_ADMIN_DOMAIN_CHANNEL."\" />\n" 
    … …  
    440440 
    441441 
    442     case LBL_ADMIN_IMPORT: 
    443     case 'LBL_ADMIN_IMPORT': 
     442    case __('Import'): 
     443    case 'ACT_ADMIN_IMPORT': 
    444444 
    445445 
    … …  
    499499 
    500500            } else { 
    501                 $prev_folder = LBL_HOME_FOLDER; 
     501                $prev_folder = __('Root'); 
    502502                $fid = 0; 
    503503            } 
    … …  
    531531                    if ($u__) { 
    532532 
    533                         echo "<li><p>" . sprintf(LBL_ADMIN_OPML_IMPORT_FEED_INFO,$t__,$f__); 
     533                        echo "<li><p>" . sprintf(__('Adding %s to %s... '),$t__,$f__); 
    534534                        flush(); 
    535535                        list($retcde, $retmsg) = add_channel($u__, $fid, $t__, $d__); 
    … …  
    543543            } 
    544544 
    545             echo "</ul>\n<p><b>".LBL_TITLE_UPDATING ."...</b></p>\n"; 
     545            echo "</ul>\n<p><b>".__('Updating') ."...</b></p>\n"; 
    546546            echo "</div>\n"; 
    547547            flush(); 
    … …  
    615615 
    616616        if ($url == '' || substr($url,0,4) != "http") { 
    617             rss_error(sprintf(LBL_ADMIN_BAD_RSS_URL,$url), RSS_ERROR_ERROR,true); 
     617            rss_error(sprintf(__("I'm sorry, I don't think I can handle this URL: '%s'"),$url), RSS_ERROR_ERROR,true); 
    618618            $ret__ = CST_ADMIN_DOMAIN_CHANNEL; 
    619619            break; 
    … …  
    741741        break; 
    742742 
    743  
     743        case 'dump': 
     744            // Make sure this is a POST 
     745            if(!isset($_POST['dumpact'])) { 
     746                die('Sorry, you can\'t access this via a GET'); 
     747            } 
     748            $tbl = array('"','&quot;'); 
     749            error_reporting(E_ALL); 
     750            rss_require('schema.php'); 
     751            $tables=getExpectedTables(); 
     752            unset($tables['cache']); 
     753            //$tables=array('channels','tag','config'); 
     754            $bfr=''; 
     755            $bfr .= '<'.'?xml version="1.0" encoding="UTF-8"?'.'>'."\n"; 
     756            $bfr .= '<dump prefix="'.getTable('').'" date="'.date('r').'">'."\n"; 
     757            foreach($tables as $table => $prefixed) { 
     758                $rs = rss_query("select * from $prefixed"); 
     759                $bfr .="<$table>\n"; 
     760                while($row=rss_fetch_assoc($rs)) { 
     761                    $r="<row "; 
     762                    foreach($row as $key => $val) { 
     763                        $val=htmlspecialchars($val); 
     764                        $r.=" $key=\"$val\" "; 
     765                    } 
     766                    $r .= "/>\n"; 
     767                    $bfr .=$r; 
     768                } 
     769                $bfr .="</$table>\n"; 
     770            } 
     771            $bfr .='</dump>'."\n"; 
     772            $gzdata = gzencode($bfr, 9); 
     773 
     774 
     775            // Delete the output buffer. This is probably a bad thing to do, if the ob'ing is turned off. 
     776            // e.g. data was already sent to the brwoser. 
     777            while (@ob_end_clean()); 
     778 
     779            // Send the dump to the browser: 
     780            header("Pragma: public"); // required 
     781            header("Expires: 0"); 
     782            header("Cache-Control: must-revalidate, post-check=0, pre-check=0"); 
     783            header("Connection: close"); 
     784            header("Content-Transfer-Encoding: binary"); 
     785            header("Content-Length: " . strlen($gzdata)); 
     786            header('Content-type: application/x-gzip'); 
     787            header('Content-disposition: inline; filename="gregarius.dump.'.date('MjSY').'.xml.gz"'); 
     788 
     789            die($gzdata); 
     790 
     791            break; 
    744792    default: 
    745793        break; 
    … …  
    764812 
    765813    echo "<div>\n"; 
    766     echo "\n\n<h2>".LBL_ADMIN_CHANNEL_EDIT_CHANNEL." '$title'</h2>\n"; 
     814    echo "\n\n<h2>".__('Edit the feed ')." '$title'</h2>\n"; 
    767815 
    768816    echo "<form method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."#fa$cid\" id=\"channeledit\">\n"; 
    … …  
    770818    // Timestamps 
    771819    if(!empty($daterefreshed)) { 
    772       echo "<p><label>" . LBL_ADDED . ": " . date("M-d-Y H:i", strtotime($dateadded)) . "</label></p>" 
    773                     ."<p><label>" . LBL_LAST_UPDATE . ": ".date("M-d-Y H:i", strtotime($daterefreshed))."</label></p>\n"; 
     820      echo "<p><label>" . __('Added') . ": " . date("M-d-Y H:i", strtotime($dateadded)) . "</label></p>" 
     821                    ."<p><label>" . __('Last Update') . ": ".date("M-d-Y H:i", strtotime($daterefreshed))."</label></p>\n"; 
    774822    } else { 
    775       echo "<p><label>" . LBL_ADDED . ": " . date("M-d-Y H:i", strtotime($dateadded)) . "</label></p>" 
    776                     ."<p><label>" . LBL_LAST_UPDATE . ": " . LBL_FOOTER_LAST_MODIF_NEVER . "</label></p>\n"; 
     823      echo "<p><label>" . __('Added') . ": " . date("M-d-Y H:i", strtotime($dateadded)) . "</label></p>" 
     824                    ."<p><label>" . __('Last Update') . ": " . __('Never') . "</label></p>\n"; 
    777825    } 
    778826    // Item name 
    779     echo "<p><label for=\"c_name\">". LBL_ADMIN_CHANNEL_NAME ."</label>\n" 
     827    echo "<p><label for=\"c_name\">". __('Title:') ."</label>\n" 
    780828    ."<input type=\"text\" id=\"c_name\" name=\"c_name\" value=\"$title\" />" 
    781829    ."<input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"". CST_ADMIN_DOMAIN_CHANNEL."\" />\n" 
    … …  
    786834 
    787835    // RSS URL 
    788     ."<p><label for=\"c_url\">". LBL_ADMIN_CHANNEL_RSS_URL ."</label>\n" 
    789     ."<a href=\"$url\">" . LBL_VISIT . "</a>\n" 
     836    ."<p><label for=\"c_url\">". __('RSS URL:') ."</label>\n" 
     837    ."<a href=\"$url\">" . __('(visit)') . "</a>\n" 
    790838    ."<input type=\"text\" id=\"c_url\" name=\"c_url\" value=\"$url\" /></p>" 
    791839 
    792840    // Site URL 
    793     ."<p><label for=\"c_siteurl\">". LBL_ADMIN_CHANNEL_SITE_URL ."</label>\n" 
    794     ."<a href=\"$siteurl\">" . LBL_VISIT . "</a>\n" 
     841    ."<p><label for=\"c_siteurl\">". __('Site URL:') ."</label>\n" 
     842    ."<a href=\"$siteurl\">" . __('(visit)') . "</a>\n" 
    795843    ."<input type=\"text\" id=\"c_siteurl\" name=\"c_siteurl\" value=\"$siteurl\" /></p>" 
    796844 
    797845    // Folder 
    798     ."<p><label for=\"c_parent\">". LBL_ADMIN_CHANNEL_FOLDER ."</label>\n" 
     846    ."<p><label for=\"c_parent\">". __('In folder:') ."</label>\n" 
    799847 
    800848    .rss_toolkit_folders_combo('c_parent',$parent) 
    … …  
    802850 
    803851    // Tags 
    804     echo "<p><label for=\"c_tags\">". LBL_TAG_FOLDERS . ":</label>\n" 
     852    echo "<p><label for=\"c_tags\">". __('Categories') . ":</label>\n" 
    805853    ."<input type=\"text\" id=\"c_tags\" name=\"c_tags\" value=\"$tags\" /></p>"; 
    806854 
    … …  
    826874    ."<input style=\"display:inline\" type=\"checkbox\" id=\"c_private\" " 
    827875    ." name=\"c_private\" value=\"1\"$pchk />\n" 
    828     ."<label for=\"c_private\">". LBL_ADMIN_CHANNEL_PRIVATE ."</label>\n" 
     876    ."<label for=\"c_private\">". __('This feed is <strong>private</strong>, only admins see it.') ."</label>\n" 
    829877    ."<input type=\"hidden\" name=\"old_priv\" value=\"$old_priv\" />\n" 
    830878    ."</p>\n"; 
    … …  
    834882    ."<input style=\"display:inline\" type=\"checkbox\" id=\"c_deleted\" " 
    835883    ." name=\"c_deleted\" value=\"1\"$dchk />\n" 
    836     ."<label for=\"c_deleted\">". LBL_ADMIN_CHANNEL_DELETED ."</label>\n" 
     884    ."<label for=\"c_deleted\">". __("This feed is <strong>deprecated</strong>, it won't be updated anymore and won't be visible in the feeds column.") ."</label>\n" 
    837885    ."<input type=\"hidden\" name=\"old_del\" value=\"$old_del\" />\n" 
    838886    ."</p>\n"; 
    … …  
    841889    // Description